From: Glenn Morris <rgm@gnu.org>
Date: Tue, 10 Sep 2013 07:21:19 +0000 (-0700)
Subject: * lisp/simple.el (read-minibuffer): Unbreak it.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1662^2~59
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a2c9b476440268e8d6fbacfec52865a76a8b395;p=emacs.git

* lisp/simple.el (read-minibuffer): Unbreak it.

Fixes: debbugs:15318
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a89b4fb8cb9..c3f6e8860d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-09-10  Glenn Morris  <rgm@gnu.org>
 
+	* simple.el (read-minibuffer): Unbreak it.  (Bug#15318)
+
 	* dired-x.el (dired-mark-sexp): Unbreak for systems where ls
 	returns "alternate access method" in mode (eg "-rw-r--r--.").
 
diff --git a/lisp/simple.el b/lisp/simple.el
index c5e5b313b7b..c8fbf0b6dae 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1231,7 +1231,7 @@ is a string to insert in the minibuffer before reading.
 Such arguments are used as in `read-from-minibuffer'.)"
   ;; Used for interactive spec `x'.
   (read-from-minibuffer prompt initial-contents minibuffer-local-map
-                        t minibuffer-history))
+                        t 'minibuffer-history))
 
 (defun eval-minibuffer (prompt &optional initial-contents)
   "Return value of Lisp expression read using the minibuffer.