From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 19 Nov 2009 09:25:40 +0000 (+0000)
Subject: * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Set
X-Git-Tag: emacs-pretest-23.1.90~348
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4265deabcbde795d4e6034f3000b4c269137a5f7;p=emacs.git

* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Set
variables for computing the prompt for reading password.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 833e0ef737b..c7525de9c73 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-19  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Set
+	variables for computing the prompt for reading password.
+
 2009-11-19  Glenn Morris  <rgm@gnu.org>
 
 	* dired-aux.el (dired-compress-file-suffixes): Add ".xz".  (Bug#4953)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index dc755d04a4a..89dca1eed28 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3804,6 +3804,12 @@ The method used must be an out-of-band method."
 	  (tramp-error
 	   v 'file-error "Cannot find copy program: %s" copy-program))
 
+	;; Set variables for computing the prompt for reading
+	;; password.
+	(setq tramp-current-method (tramp-file-name-method v)
+	      tramp-current-user   (tramp-file-name-user v)
+	      tramp-current-host   (tramp-file-name-host v))
+
 	(unwind-protect
 	    (with-temp-buffer
 	      ;; The default directory must be remote.