* net/tramp.el (tramp-action-password): Let-bind enable-recursive-minibuffers to t.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index edfe575a57661330cd85c67bc829236ecf6f73be..434e1a7f85f79cde84120d0a7c7788328dab0277 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-19  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-action-password): Let-bind
+       `enable-recursive-minibuffers' to t.
+
 2012-04-18  Sam Steingold  <sds@gnu.org>
 
        * progmodes/gud.el (gud-key-prefix): Use :type 'key-sequence

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5b4ea1e6f17670a1a630b8bf52c7378b555f8a43..95848ac34ea3d6e5ca654d1cdfa0ea397aff7f2c 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3133,11 +3133,12 @@ beginning of local filename are not substituted."
 (defun tramp-action-password (proc vec)
   "Query the user for a password."
   (with-current-buffer (process-buffer proc)
-    (tramp-check-for-regexp proc tramp-password-prompt-regexp)
-    (tramp-message vec 3 "Sending %s" (match-string 1))
-    (tramp-enter-password proc)
-    ;; Hide password prompt.
-    (narrow-to-region (point-max) (point-max))))
+    (let ((enable-recursive-minibuffers t))
+      (tramp-check-for-regexp proc tramp-password-prompt-regexp)
+      (tramp-message vec 3 "Sending %s" (match-string 1))
+      (tramp-enter-password proc)
+      ;; Hide password prompt.
+      (narrow-to-region (point-max) (point-max)))))
 
 (defun tramp-action-succeed (proc vec)
   "Signal success in finding shell prompt."