X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-address.el;h=8eba7a0b77681f1f03c597840ef2276eda554adc;hb=0fc424a1f00f49599c231e8dcbdb2fe156f237e3;hp=1a7c5771ad9931650bdeed2a9fdab8ed51d81260;hpb=d4c598dc9ed3af0d38fde9b9f0dcf6fa8dd62351;p=notmuch

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index 1a7c5771..8eba7a0b 100644
--- a/emacs/notmuch-address.el
+++ b/emacs/notmuch-address.el
@@ -54,15 +54,22 @@ line."
 	 (completion-ignore-case t)
 	 (options (notmuch-address-options orig))
 	 (num-options (length options))
-	 (chosen (if (eq num-options 1)
-		     (car 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))))
-    (when chosen
-      (push chosen notmuch-address-history)
-      (delete-region beg end)
-      (insert chosen))))
+				    '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)