From 0fc424a1f00f49599c231e8dcbdb2fe156f237e3 Mon Sep 17 00:00:00 2001 From: David Edmondson <dme@dme.org> Date: Wed, 21 Dec 2011 12:35:27 +0000 Subject: [PATCH] emacs: Don't prompt the user to choose from zero matching addresses. If the address matching function generates no matches, don't prompt the user to choose between them (!). Instead, generate a message to report that there were no matches. --- emacs/notmuch-address.el | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) 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) -- 2.45.2