[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107963: * net/tramp.el (tramp-action-password): Let-bind enable-recursive-minibuffers to t.

[Michael Albinus]

------------------------------------------------------------
revno: 107963
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Thu 2012-04-19 10:37:10 +0200
message:
  * net/tramp.el (tramp-action-password): Let-bind enable-recursive-minibuffers 
to t.
modified:
  lisp/ChangeLog
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-18 20:26:57 +0000
+++ b/lisp/ChangeLog    2012-04-19 08:37:10 +0000
@@ -1,3 +1,8 @@
+2012-04-19  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-action-password): Let-bind
+       `enable-recursive-minibuffers' to t.
+
 2012-04-18  Sam Steingold  <address@hidden>
 
        * progmodes/gud.el (gud-key-prefix): Use :type 'key-sequence

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2012-04-09 13:05:48 +0000
+++ b/lisp/net/tramp.el 2012-04-19 08:37:10 +0000
@@ -3133,11 +3133,12 @@
 (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."