emacs: logically group def{custom,face}s

[notmuch] / emacs / notmuch-address.el

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index 69a52a295a59404b70bc8a9d8d75e809a083931b..2e8b8402f2c29fa8580adabc92aec61438bcddf4 100644 (file)
--- 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\\):"
@@ -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)