diff options
| author | Michael Albinus | 2008-03-21 18:04:42 +0000 |
|---|---|---|
| committer | Michael Albinus | 2008-03-21 18:04:42 +0000 |
| commit | 12aeeb576a8e232f3b82eb92b87004da148bc640 (patch) | |
| tree | 80e7d8d7b159cbdc3f9ed26ed86b325be34c283d | |
| parent | e52196e09a403e7013084019c7454e354c4ac51c (diff) | |
| download | emacs-12aeeb576a8e232f3b82eb92b87004da148bc640.tar.gz emacs-12aeeb576a8e232f3b82eb92b87004da148bc640.zip | |
* tramp.el (tramp-methods): Fix tramp-copy-args of "pscp" and "psftp".
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7967d04c0ea..6af04a5152e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-03-21 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-methods): Fix tramp-copy-args of "pscp" and | ||
| 4 | "psftp". | ||
| 5 | |||
| 1 | 2008-03-21 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2008-03-21 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * vc-hooks.el (vc-default-mode-line-string): Add case for added files. | 8 | * vc-hooks.el (vc-default-mode-line-string): Add case for added files. |
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 3a365015174..ac6f64a45da 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -535,7 +535,7 @@ files conditionalize this setup based on the TERM environment variable." | |||
| 535 | ("-ssh"))) | 535 | ("-ssh"))) |
| 536 | (tramp-remote-sh "/bin/sh") | 536 | (tramp-remote-sh "/bin/sh") |
| 537 | (tramp-copy-program "pscp") | 537 | (tramp-copy-program "pscp") |
| 538 | (tramp-copy-args (("-scp") ("-p" "%k"))) | 538 | (tramp-copy-args (("-P") ("%p") ("-scp") ("-p" "%k"))) |
| 539 | (tramp-copy-keep-date t) | 539 | (tramp-copy-keep-date t) |
| 540 | (tramp-password-end-of-line "xy") ;see docstring for "xy" | 540 | (tramp-password-end-of-line "xy") ;see docstring for "xy" |
| 541 | (tramp-default-port 22)) | 541 | (tramp-default-port 22)) |
| @@ -544,7 +544,7 @@ files conditionalize this setup based on the TERM environment variable." | |||
| 544 | ("-ssh"))) | 544 | ("-ssh"))) |
| 545 | (tramp-remote-sh "/bin/sh") | 545 | (tramp-remote-sh "/bin/sh") |
| 546 | (tramp-copy-program "pscp") | 546 | (tramp-copy-program "pscp") |
| 547 | (tramp-copy-args (("-psftp") ("-p" "%k"))) | 547 | (tramp-copy-args (("-P") ("%p") ("-sftp") ("-p" "%k"))) |
| 548 | (tramp-copy-keep-date t) | 548 | (tramp-copy-keep-date t) |
| 549 | (tramp-password-end-of-line "xy")) ;see docstring for "xy" | 549 | (tramp-password-end-of-line "xy")) ;see docstring for "xy" |
| 550 | ("fcp" (tramp-login-program "fsh") | 550 | ("fcp" (tramp-login-program "fsh") |