debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: Don't prompt the user to choose from zero matching addresses.

Browse source 
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.
This commit is contained in:
David Edmondson 2011-12-21 12:35:27 +00:00 committed by David Bremner
parent d4c598dc9e
commit 0fc424a1f0
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
emacs/notmuch-address.el
View file

@ -54,15 +54,22 @@ line."
(completion-ignore-case t) (completion-ignore-case t)
(options (notmuch-address-options orig)) (options (notmuch-address-options orig))
(num-options (length options)) (num-options (length options))
(chosen (if (eq num-options 1) (chosen (cond
(car options) ((eq num-options 0)
nil)
((eq num-options 1)
(car options))
(t
(completing-read (format "Address (%s matches): " num-options) (completing-read (format "Address (%s matches): " num-options)
(cdr options) nil nil (car options) (cdr options) nil nil (car options)
'notmuch-address-history)))) 'notmuch-address-history)))))
(when chosen (if chosen
(push chosen notmuch-address-history) (progn
(delete-region beg end) (push chosen notmuch-address-history)
(insert chosen)))) (delete-region beg end)
(insert chosen))
(message "No matches.")
(ding))))
;; Copied from `w3m-which-command'. ;; Copied from `w3m-which-command'.
(defun notmuch-address-locate-command (command) (defun notmuch-address-locate-command (command)