diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2005-09-07 21:23:36 +0000 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2005-09-07 21:23:36 +0000 |
| commit | 553f03bcd2591933df371d8926be18072ea37041 (patch) | |
| tree | d9fcea5e596d9a41b8f03ac290bc61e041690c35 /lisp/net | |
| parent | dcc6da3a1cf566b4ba8792814ebf93eed7581344 (diff) | |
| download | emacs-553f03bcd2591933df371d8926be18072ea37041.tar.gz | |
* woman.el (top): Remap `man' command by `woman' in
`woman-mode-map'.
(Man-getpage-in-background-advice): Remove defadvice; it isn't
necessary any longer with the remapped command.
(Man-bgproc-sentinel-advice): Remove defadvice which counts
formatting time only.
* net/tramp.el (tramp-action-password)
(tramp-multi-action-password): Compile the password prompt from
`method', `user' and `host'. Sometimes it isn't obvious which
password to enter, for example with remote files offered by
recentf.el, or with multiple steps. Suggested by Robert Marshall
<robert@chezmarshall.freeserve.co.uk>.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp.el | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index e721f3fb016..b8b3fb9068a 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -5213,7 +5213,10 @@ Returns nil if none was found, else the command is returned." (defun tramp-action-password (p multi-method method user host) "Query the user for a password." - (let ((pw-prompt (match-string 0))) + (let ((pw-prompt + (format "Password for %s " + (tramp-make-tramp-file-name + nil method user host "")))) (tramp-message 9 "Sending password") (tramp-enter-password p pw-prompt user host))) @@ -5300,8 +5303,12 @@ The terminal type can be configured with `tramp-terminal-type'." (defun tramp-multi-action-password (p method user host) "Query the user for a password." - (tramp-message 9 "Sending password") - (tramp-enter-password p (match-string 0) user host)) + (let ((pw-prompt + (format "Password for %s " + (tramp-make-tramp-file-name + nil method user host "")))) + (tramp-message 9 "Sending password") + (tramp-enter-password p pw-prompt user host))) (defun tramp-multi-action-succeed (p method user host) "Signal success in finding shell prompt." |