[Emacs-diffs] Changes to emacs/lisp/net/tramp.el

[Michael Albinus]

Index: emacs/lisp/net/tramp.el
diff -c emacs/lisp/net/tramp.el:1.75 emacs/lisp/net/tramp.el:1.76
*** emacs/lisp/net/tramp.el:1.75        Wed Aug 31 20:28:48 2005
--- emacs/lisp/net/tramp.el     Wed Sep  7 21:23:36 2005
***************
*** 5213,5219 ****
  
  (defun tramp-action-password (p multi-method method user host)
    "Query the user for a password."
!   (let ((pw-prompt (match-string 0)))
      (tramp-message 9 "Sending password")
      (tramp-enter-password p pw-prompt user host)))
  
--- 5213,5222 ----
  
  (defun tramp-action-password (p multi-method method user host)
    "Query the user for a password."
!   (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,5307 ****
  
  (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))
  
  (defun tramp-multi-action-succeed (p method user host)
    "Signal success in finding shell prompt."
--- 5303,5314 ----
  
  (defun tramp-multi-action-password (p method user host)
    "Query the user for a password."
!   (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."