[Emacs-diffs] trunk r114187: * lisp/simple.el (read-minibuffer): Unbreak it.

[Glenn Morris]

------------------------------------------------------------
revno: 114187
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15318
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-10 00:21:19 -0700
message:
  * lisp/simple.el (read-minibuffer): Unbreak it.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/simple.el                 simple.el-20091113204419-o5vbwnq5f7feedwu-403

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-10 01:28:01 +0000
+++ b/lisp/ChangeLog    2013-09-10 07:21:19 +0000
@@ -1,5 +1,7 @@
 2013-09-10  Glenn Morris  <address@hidden>
 
+       * 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--.").
 

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2013-08-28 21:19:54 +0000
+++ b/lisp/simple.el    2013-09-10 07:21:19 +0000
@@ -1231,7 +1231,7 @@
 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.