Merge branch 'release'

[notmuch] / emacs / notmuch-address.el

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index 36c796f9e34d11145dda5162a3360cf5db2f31c6..b3c56cfaad9dc212b990559171c1df2499b39722 100644 (file)
--- a/emacs/notmuch-address.el
+++ b/emacs/notmuch-address.el
@@ -98,7 +98,7 @@ to know how address selection is made by default."
   :group 'notmuch-send
   :group 'notmuch-external)
 
   :group 'notmuch-send
   :group 'notmuch-external)
 

-(defcustom notmuch-address-completion-hook nil
+(defcustom notmuch-address-post-completion-functions nil

   "Functions called after completing address.
 
 The completed address is passed as an argument to each function.
   "Functions called after completing address.
 
 The completed address is passed as an argument to each function.


@@ -147,11 +147,11 @@ toggles the setting in this buffer."
   (interactive)
   (if (local-variable-p 'notmuch-address-command)
       (kill-local-variable 'notmuch-address-command)
   (interactive)
   (if (local-variable-p 'notmuch-address-command)
       (kill-local-variable 'notmuch-address-command)

-    (setq-local notmuch-address-command 'internal))
+    (notmuch-setq-local notmuch-address-command 'internal))

   (if (boundp 'company-idle-delay)
       (if (local-variable-p 'company-idle-delay)
          (kill-local-variable 'company-idle-delay)
   (if (boundp 'company-idle-delay)
       (if (local-variable-p 'company-idle-delay)
          (kill-local-variable 'company-idle-delay)

-       (setq-local company-idle-delay nil))))
+       (notmuch-setq-local company-idle-delay nil))))

 
 (defun notmuch-address-matching (substring)
   "Returns a list of completion candidates matching SUBSTRING.
 
 (defun notmuch-address-matching (substring)
   "Returns a list of completion candidates matching SUBSTRING.


@@ -218,7 +218,7 @@ external commands."
            (push chosen notmuch-address-history)
            (delete-region beg end)
            (insert chosen)
            (push chosen notmuch-address-history)
            (delete-region beg end)
            (insert chosen)

-           (run-hook-with-args 'notmuch-address-completion-hook chosen))
+           (run-hook-with-args 'notmuch-address-post-completion-functions chosen))

        (message "No matches.")
        (ding))))
    (t nil)))
        (message "No matches.")
        (ding))))
    (t nil)))