X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-address.el;h=2bf762ba9b1a0ae3a3970cf2ac2dfdc4ef4071f1;hb=0e386504345857725893d4da45338f00cc2147fa;hp=69a52a295a59404b70bc8a9d8d75e809a083931b;hpb=bae184f5fc4b824b7557551b0e1bc6a81c014a25;p=notmuch

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index 69a52a29..2bf762ba 100644
--- a/emacs/notmuch-address.el
+++ b/emacs/notmuch-address.el
@@ -28,7 +28,8 @@
 single argument and output a list of possible matches, one per
 line."
   :type 'string
-  :group 'notmuch)
+  :group 'notmuch-send
+  :group 'notmuch-external)
 
 (defvar notmuch-address-message-alist-member
   '("^\\(Resent-\\)?\\(To\\|B?Cc\\|Reply-To\\|From\\|Mail-Followup-To\\|Mail-Copies-To\\):"
@@ -37,9 +38,9 @@ line."
 (defvar notmuch-address-history nil)
 
 (defun notmuch-address-message-insinuate ()
-  (if (not (memq notmuch-address-message-alist-member message-completion-alist))
-      (setq message-completion-alist
-	    (push notmuch-address-message-alist-member message-completion-alist))))
+  (unless (memq notmuch-address-message-alist-member message-completion-alist)
+    (setq message-completion-alist
+	  (push notmuch-address-message-alist-member message-completion-alist))))
 
 (defun notmuch-address-options (original)
   (process-lines notmuch-address-command original))
@@ -53,14 +54,23 @@ line."
 	 (orig (buffer-substring-no-properties beg end))
 	 (completion-ignore-case t)
 	 (options (notmuch-address-options orig))
-	 (chosen (if (eq (length options) 1)
-		     (car options)
-		   (completing-read "Address: " (cdr options) nil nil (car options)
-				    'notmuch-address-history))))
-    (when chosen
-      (push chosen notmuch-address-history)
-      (delete-region beg end)
-      (insert chosen))))
+	 (num-options (length options))
+	 (chosen (cond
+		  ((eq num-options 0)
+		   nil)
+		  ((eq num-options 1)
+		   (car options))
+		  (t
+		   (completing-read (format "Address (%s matches): " num-options)
+				    (cdr options) nil nil (car options)
+				    'notmuch-address-history)))))
+    (if chosen
+	(progn
+	  (push chosen notmuch-address-history)
+	  (delete-region beg end)
+	  (insert chosen))
+      (message "No matches.")
+      (ding))))
 
 ;; Copied from `w3m-which-command'.
 (defun notmuch-address-locate-command (command)