]> git.notmuchmail.org Git - notmuch/blobdiff - emacs/notmuch-address.el
lib: fix messages.c build warn
[notmuch] / emacs / notmuch-address.el
index 69a52a295a59404b70bc8a9d8d75e809a083931b..8eba7a0b77681f1f03c597840ef2276eda554adc 100644 (file)
@@ -53,14 +53,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)