diff options
| author | Michael Albinus | 2009-11-19 09:25:40 +0000 |
|---|---|---|
| committer | Michael Albinus | 2009-11-19 09:25:40 +0000 |
| commit | 4265deabcbde795d4e6034f3000b4c269137a5f7 (patch) | |
| tree | ed0d9068b88389b9aec43a315f509f049500f578 | |
| parent | 470bce7d544776ea7a5c37f0ec8eee4951157aa8 (diff) | |
| download | emacs-4265deabcbde795d4e6034f3000b4c269137a5f7.tar.gz emacs-4265deabcbde795d4e6034f3000b4c269137a5f7.zip | |
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Set
variables for computing the prompt for reading password.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 833e0ef737b..c7525de9c73 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-11-19 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Set | ||
| 4 | variables for computing the prompt for reading password. | ||
| 5 | |||
| 1 | 2009-11-19 Glenn Morris <rgm@gnu.org> | 6 | 2009-11-19 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * dired-aux.el (dired-compress-file-suffixes): Add ".xz". (Bug#4953) | 8 | * 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." | |||
| 3804 | (tramp-error | 3804 | (tramp-error |
| 3805 | v 'file-error "Cannot find copy program: %s" copy-program)) | 3805 | v 'file-error "Cannot find copy program: %s" copy-program)) |
| 3806 | 3806 | ||
| 3807 | ;; Set variables for computing the prompt for reading | ||
| 3808 | ;; password. | ||
| 3809 | (setq tramp-current-method (tramp-file-name-method v) | ||
| 3810 | tramp-current-user (tramp-file-name-user v) | ||
| 3811 | tramp-current-host (tramp-file-name-host v)) | ||
| 3812 | |||
| 3807 | (unwind-protect | 3813 | (unwind-protect |
| 3808 | (with-temp-buffer | 3814 | (with-temp-buffer |
| 3809 | ;; The default directory must be remote. | 3815 | ;; The default directory must be remote. |