* tramp.el (tramp-methods): Fix tramp-copy-args of "pscp" and "psftp".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7967d04c0ea0aab377a484a74ecfc5197f5cd21c..6af04a5152ec5da4848f7e9eb09166efb6e82e53 100644 (file)
--- 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 3a365015174d2b5ea3a62b34fc8432fcf087ca6d..ac6f64a45da73ad25fd387f2461b985ac79fb0c5 100644 (file)
--- 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")