emacs: notmuch-address-expand-name: use the actual initial-input

[notmuch] / emacs / notmuch-address.el

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index 6e1364730d95edd519c2772b4ad6e83a9fac0440..f0af666754b798ac0f83b90db079f8aecd94422a 100644 (file)
--- a/emacs/notmuch-address.el
+++ b/emacs/notmuch-address.el
@@ -244,14 +244,8 @@ requiring external commands."
                    (t
                     (funcall notmuch-address-selection-function
                              (format "Address (%s matches): " num-options)
                    (t
                     (funcall notmuch-address-selection-function
                              (format "Address (%s matches): " num-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))))))
+                             options
+                             orig)))))

       (if chosen
          (progn
            (push chosen notmuch-address-history)
       (if chosen
          (progn
            (push chosen notmuch-address-history)