Fix history adding in ido-read-internal

Assume, for example, the head of matches is "RSS" and user input is
"rs". If the user hit RET, "RSS" is selected but "rs" is added to the
history. This commit fixes this inconsistency.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c119c3732308804e8b1f02ae8c5246d5a069384..a52abe07b1f51d971f30103e00ed8201914d0210 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-21  Leo Liu  <sdl.web@gmail.com>
+
+       * ido.el (ido-read-internal): Add ido-selected to history instead
+       of user input.
+
 2011-03-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * subr.el (deferred-action-list, deferred-action-function):

diff --git a/lisp/ido.el b/lisp/ido.el
index 2a5c7cf2f0e76bb04bcd39cb4fe498be44b75b4b..df7516993b70a633b40d70bce970b9af2a963f99 100644 (file)
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1978,7 +1978,9 @@ If INITIAL is non-nil, it specifies the initial input string."
           (ido-completing-read t)
           (ido-require-match require-match)
           (ido-use-mycompletion-depth (1+ (minibuffer-depth)))
-          (show-paren-mode nil))
+          (show-paren-mode nil)
+          ;; Postpone history adding till later
+          (history-add-new-input nil))
        ;; prompt the user for the file name
        (setq ido-exit nil)
        (setq ido-final-text
@@ -2158,6 +2160,7 @@ If INITIAL is non-nil, it specifies the initial input string."
 
         (t
          (setq done t))))))
+    (and history (add-to-history history ido-selected))
     ido-selected))
 
 (defun ido-edit-input ()