From 553f03bcd2591933df371d8926be18072ea37041 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 7 Sep 2005 21:23:36 +0000 Subject: * 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 . --- lisp/net/tramp.el | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'lisp/net') 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." -- cgit v1.2.3