branch: externals/company
commit e439046dfcfb2a3bc282d5c58065abbc10d137be
Author: Dmitry Gutov <[email protected]>
Commit: Dmitry Gutov <[email protected]>
Set up "no interference" for eldoc after company-echo-show
Resolves #797
---
company.el | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/company.el b/company.el
index bb5b1036d5..ed5bd9919e 100644
--- a/company.el
+++ b/company.el
@@ -4798,5 +4798,14 @@ Delay is determined by `company-tooltip-idle-delay'."
(`unhide (company-echo-show))
(`hide (company-echo-hide))))
+(eldoc-add-command-completions "company-")
+
+(defun company--eldoc-no-inteference-p ()
+ (member company-echo-last-msg '(nil "")))
+
+(advice-add #'eldoc-display-message-no-interference-p
+ :after-while
+ #'company--eldoc-no-inteference-p)
+
(provide 'company)
;;; company.el ends here
