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

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

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9eeac0d2155..57916aa2f0a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/lisp/ido.el b/lisp/ido.el
index 177f9338870..0ce83d9b88c 100644
--- 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 ()