diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2008-03-21 18:04:42 +0000 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2008-03-21 18:04:42 +0000 |
commit | 12aeeb576a8e232f3b82eb92b87004da148bc640 (patch) | |
tree | 80e7d8d7b159cbdc3f9ed26ed86b325be34c283d /lisp | |
parent | e52196e09a403e7013084019c7454e354c4ac51c (diff) | |
download | emacs-12aeeb576a8e232f3b82eb92b87004da148bc640.tar.gz |
* tramp.el (tramp-methods): Fix tramp-copy-args of "pscp" and "psftp".
Diffstat (limited to 'lisp')
-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 @@ +2008-03-21 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-methods): Fix tramp-copy-args of "pscp" and + "psftp". + 2008-03-21 Stefan Monnier <monnier@iro.umontreal.ca> * 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." ("-ssh"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program "pscp") - (tramp-copy-args (("-scp") ("-p" "%k"))) + (tramp-copy-args (("-P") ("%p") ("-scp") ("-p" "%k"))) (tramp-copy-keep-date t) (tramp-password-end-of-line "xy") ;see docstring for "xy" (tramp-default-port 22)) @@ -544,7 +544,7 @@ files conditionalize this setup based on the TERM environment variable." ("-ssh"))) (tramp-remote-sh "/bin/sh") (tramp-copy-program "pscp") - (tramp-copy-args (("-psftp") ("-p" "%k"))) + (tramp-copy-args (("-P") ("%p") ("-sftp") ("-p" "%k"))) (tramp-copy-keep-date t) (tramp-password-end-of-line "xy")) ;see docstring for "xy" ("fcp" (tramp-login-program "fsh") |