X-Git-Url: http://rtime.felk.cvut.cz/gitweb/notmuch.git/blobdiff_plain/2cf0ef3998a75a8e5bcd83f0a286d9660f1bdb0e..827c28a04effc58f29e751788690d2f4b434902d:/emacs/notmuch-company.el

diff --git a/emacs/notmuch-company.el b/emacs/notmuch-company.el
index 610e223d..168315ff 100644
--- a/emacs/notmuch-company.el
+++ b/emacs/notmuch-company.el
@@ -47,7 +47,13 @@
 (defun notmuch-company-setup ()
   (company-mode)
   (make-local-variable 'company-backends)
-  (setq company-backends '(notmuch-company)))
+  (setq company-backends '(notmuch-company))
+  ;; Disable automatic company completion unless an internal
+  ;; completion method is configured. Company completion (using
+  ;; internal completion) can still be accessed via standard company
+  ;; functions, e.g., company-complete.
+  (unless (eq notmuch-address-command 'internal)
+    (setq-local company-idle-delay nil)))
 
 ;;;###autoload
 (defun notmuch-company (command &optional arg &rest _ignore)