X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-address.el;h=b3c56cfaad9dc212b990559171c1df2499b39722;hb=71012e81098dce71cbd69479ecdee375a24db79c;hp=10eaab196267bbad86c967e1318ea6083a577b44;hpb=827c28a04effc58f29e751788690d2f4b434902d;p=notmuch

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index 10eaab19..b3c56cfa 100644
--- a/emacs/notmuch-address.el
+++ b/emacs/notmuch-address.el
@@ -98,6 +98,17 @@ to know how address selection is made by default."
   :group 'notmuch-send
   :group 'notmuch-external)
 
+(defcustom notmuch-address-post-completion-functions nil
+  "Functions called after completing address.
+
+The completed address is passed as an argument to each function.
+Note that this hook will be invoked for completion in headers
+matching `notmuch-address-completion-headers-regexp'.
+"
+  :type 'hook
+  :group 'notmuch-address
+  :group 'notmuch-hooks)
+
 (defun notmuch-address-selection-function (prompt collection initial-input)
   "Call (`completing-read'
       PROMPT COLLECTION nil nil INITIAL-INPUT 'notmuch-address-history)"
@@ -136,11 +147,11 @@ toggles the setting in this buffer."
   (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)
-	(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.
@@ -194,12 +205,20 @@ external commands."
 		    (t
 		     (funcall notmuch-address-selection-function
 			      (format "Address (%s matches): " num-options)
-			      (cdr options) (car options))))))
+			      ;; We put the first match as the initial
+			      ;; input; we put all the matches as
+			      ;; possible completions, moving the
+			      ;; first match to the end of the list
+			      ;; makes cursor up/down in the list work
+			      ;; better.
+			      (append (cdr options) (list (car options)))
+			      (car options))))))
       (if chosen
 	  (progn
 	    (push chosen notmuch-address-history)
 	    (delete-region beg end)
-	    (insert chosen))
+	    (insert chosen)
+	    (run-hook-with-args 'notmuch-address-post-completion-functions chosen))
 	(message "No matches.")
 	(ding))))
    (t nil)))