diff options
| author | Michael Albinus | 2012-04-19 10:37:10 +0200 |
|---|---|---|
| committer | Michael Albinus | 2012-04-19 10:37:10 +0200 |
| commit | 8c8fc5df12e86cecc16848fff19a251438a25982 (patch) | |
| tree | 2119ee3d7a3b37f14d15b21f8792000dde39eb37 | |
| parent | a77b0ac9928f2ec476de39c704bb899fa4731859 (diff) | |
| download | emacs-8c8fc5df12e86cecc16848fff19a251438a25982.tar.gz emacs-8c8fc5df12e86cecc16848fff19a251438a25982.zip | |
* net/tramp.el (tramp-action-password): Let-bind enable-recursive-minibuffers to t.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index edfe575a576..434e1a7f85f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-04-19 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-action-password): Let-bind | ||
| 4 | `enable-recursive-minibuffers' to t. | ||
| 5 | |||
| 1 | 2012-04-18 Sam Steingold <sds@gnu.org> | 6 | 2012-04-18 Sam Steingold <sds@gnu.org> |
| 2 | 7 | ||
| 3 | * progmodes/gud.el (gud-key-prefix): Use :type 'key-sequence | 8 | * progmodes/gud.el (gud-key-prefix): Use :type 'key-sequence |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5b4ea1e6f17..95848ac34ea 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -3133,11 +3133,12 @@ beginning of local filename are not substituted." | |||
| 3133 | (defun tramp-action-password (proc vec) | 3133 | (defun tramp-action-password (proc vec) |
| 3134 | "Query the user for a password." | 3134 | "Query the user for a password." |
| 3135 | (with-current-buffer (process-buffer proc) | 3135 | (with-current-buffer (process-buffer proc) |
| 3136 | (tramp-check-for-regexp proc tramp-password-prompt-regexp) | 3136 | (let ((enable-recursive-minibuffers t)) |
| 3137 | (tramp-message vec 3 "Sending %s" (match-string 1)) | 3137 | (tramp-check-for-regexp proc tramp-password-prompt-regexp) |
| 3138 | (tramp-enter-password proc) | 3138 | (tramp-message vec 3 "Sending %s" (match-string 1)) |
| 3139 | ;; Hide password prompt. | 3139 | (tramp-enter-password proc) |
| 3140 | (narrow-to-region (point-max) (point-max)))) | 3140 | ;; Hide password prompt. |
| 3141 | (narrow-to-region (point-max) (point-max))))) | ||
| 3141 | 3142 | ||
| 3142 | (defun tramp-action-succeed (proc vec) | 3143 | (defun tramp-action-succeed (proc vec) |
| 3143 | "Signal success in finding shell prompt." | 3144 | "Signal success in finding shell prompt." |