From: Mark Walters Date: Tue, 27 Sep 2016 15:45:27 +0000 (+0100) Subject: emacs: include first match in address completion X-Git-Tag: 0.24_rc0~128 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=0c52b5d3b29205059dbd308fa8e52558df57401b emacs: include first match in address completion The current code for address completion takes the list of possible completions (whether generated internally or externally), makes the first match the initial value for the completion, and puts all the others (but not the first match) into the possible completions. This has the nice effect that the key takes you immediately to the next completion (whereas if the first match were included in the possible completions it would take you to the first match again). However, it has two side effects. First, once you have completed to the full match you find it says and try completing again you get told "no match" not "sole completion". Secondly, if you delete some of the text and try completing you don't get the first match as an option. This tries to get round most of these problems by including the full list of possible completions, but with the first match moved to the very end of the list. --- diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el index 10eaab19..b2e1fba7 100644 --- a/emacs/notmuch-address.el +++ b/emacs/notmuch-address.el @@ -194,7 +194,14 @@ external commands." (t (funcall notmuch-address-selection-function (format "Address (%s matches): " num-options) - (cdr options) (car options)))))) + ;; We put the first match as the initial + ;; input; we put all the matches as + ;; possible completions, moving the + ;; first match to the end of the list + ;; makes cursor up/down in the list work + ;; better. + (append (cdr options) (list (car options))) + (car options)))))) (if chosen (progn (push chosen notmuch-address-history)