Merge branch 'release'

[notmuch] / emacs / notmuch-company.el

diff --git a/emacs/notmuch-company.el b/emacs/notmuch-company.el
index b0f9782175a0c0d1c78c67045d0030785e8ab7a9..ebe2c0846e1b2108f520023e3198970d7e43410e 100644 (file)
--- a/emacs/notmuch-company.el
+++ b/emacs/notmuch-company.el
@@ -28,6 +28,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
 ;;; Code:
 
 (eval-when-compile (require 'cl))

+(require 'notmuch-lib)

 
 (defvar notmuch-company-last-prefix nil)
 (make-variable-buffer-local 'notmuch-company-last-prefix)
 
 (defvar notmuch-company-last-prefix nil)
 (make-variable-buffer-local 'notmuch-company-last-prefix)


@@ -53,7 +54,7 @@
   ;; internal completion) can still be accessed via standard company
   ;; functions, e.g., company-complete.
   (unless (eq notmuch-address-command 'internal)
   ;; 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)))
+    (notmuch-setq-local company-idle-delay nil)))

 
 ;;;###autoload
 (defun notmuch-company (command &optional arg &rest _ignore)
 
 ;;;###autoload
 (defun notmuch-company (command &optional arg &rest _ignore)