2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83ac7fa86ef..ddbb1c2d3df 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (read-passwd): Allow use from a minibuffer.
+
 2012-08-14  Eli Zaretskii  <eliz@gnu.org>
 
         * tooltip.el (tooltip-identifier-from-point): Don't treat tokens
@@ -13,8 +17,8 @@
         * progmodes/gdb-mi.el (gdb-tooltip-print): Don't ignore error
         messages from GDB, pop them up in a tooltip to give feedback to
         user.
-        (gdb-tooltip-print-1): Quote the expression to evaluate.  This
-        allows to evaluate expressions with embedded whitespace.
+        (gdb-tooltip-print-1): Quote the expression to evaluate.
+        This allows to evaluate expressions with embedded whitespace.
         (gdb-inferior-io--init-proc): Don't send "-inferior-tty" command
         if the TTY name is nil or empty (which happens when communicating
         with the inferior via pipes, e.g. on MS-Windows).
diff --git a/lisp/subr.el b/lisp/subr.el
index 4f566a3e1d3..04ff81e997a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2182,7 +2182,8 @@ by doing (clear-string STRING)."
             (set (make-local-variable 'post-self-insert-hook) nil)
             (add-hook 'after-change-functions hide-chars-fun nil 'local))
         (unwind-protect
-            (read-string prompt nil t default) ; t = "no history"
+            (let ((enable-recursive-minibuffers t))
+              (read-string prompt nil t default)) ; t = "no history"
           (when (buffer-live-p minibuf)
             (with-current-buffer minibuf
               ;; Not sure why but it seems that there might be cases where the