Add to minibuffer-history if HISOTRY is nil in ido.el

It is broken by the change on 2011-03-21.

Add to minibuffer-history if HISOTRY is nil in ido.el
It is broken by the change on 2011-03-21.
ea622834 · Leo Liu · ac45a338 · ea622834 · ea622834
Commit ea622834 authored Mar 29, 2011 by Leo Liu
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +5 -0

lisp/ido.el lisp/ido.el +1 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+2011-03-29  Leo Liu  <sdl.web@gmail.com>
+
+	* ido.el (ido-read-internal): Use the default history var
+	minibuffer-history if no HISTORY is specified.
+
 2011-03-28  Leo Liu  <sdl.web@gmail.com>
  
 	* abbrev.el (abbrev-table-empty-p): New function.

--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2151,7 +2151,7 @@ If INITIAL is non-nil, it specifies the initial input string."

 	 (t
 	  (setq done t))))))
-    (and history (add-to-history history ido-selected))
+    (add-to-history (or history 'minibuffer-history) ido-selected)
    ido-selected))

 (defun ido-edit-input ()