* net/tramp.el (tramp-methods): Add recursive options to "scpc",

"scpx", "pscp" and "psftp".

Please do not sync with the trunk.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c38f6a87b14dc4c4fc9dbf95adb3e78273cea8f9..4a89aca9ac451ab3cc046ff2320eef698240bc3b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-31  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-methods): Add recursive options to "scpc",
+       "scpx", "pscp" and "psftp".
+
 2010-12-31  Eli Zaretskii  <eliz@gnu.org>
 
        * term/w32-win.el (image-library-alist): Set up correctly for

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index babcc2ca250a1ae5978b7b2a7e2ef8bf3e00aac3..16b02322c93e4ff1d4149559fe6217181b624572 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -553,10 +553,11 @@ detected as prompt when being sent on echoing hosts, therefore.")
             (tramp-async-args           (("-q")))
             (tramp-remote-sh            "/bin/sh")
             (tramp-copy-program         "scp")
-            (tramp-copy-args            (("-P" "%p") ("-p" "%k") ("-q")
+            (tramp-copy-args            (("-P" "%p") ("-p" "%k") ("-q") ("-r")
                                          ("-o" "ControlPath=%t.%%r@%%h:%%p")
                                          ("-o" "ControlMaster=auto")))
             (tramp-copy-keep-date       t)
+            (tramp-copy-recursive       t)
             (tramp-password-end-of-line nil)
             (tramp-gw-args              (("-o"
                                           "GlobalKnownHostsFile=/dev/null")
@@ -570,8 +571,10 @@ detected as prompt when being sent on echoing hosts, therefore.")
             (tramp-async-args           (("-q")))
             (tramp-remote-sh            "/bin/sh")
             (tramp-copy-program         "scp")
-            (tramp-copy-args            (("-p" "%k")))
+            (tramp-copy-args            (("-P" "%p") ("-p" "%k")
+                                         ("-q") ("-r")))
             (tramp-copy-keep-date       t)
+            (tramp-copy-recursive       t)
             (tramp-password-end-of-line nil)
             (tramp-gw-args              (("-o"
                                           "GlobalKnownHostsFile=/dev/null")
@@ -640,8 +643,10 @@ detected as prompt when being sent on echoing hosts, therefore.")
                                          ("-ssh") ("%h")))
             (tramp-remote-sh            "/bin/sh")
             (tramp-copy-program         "pscp")
-            (tramp-copy-args            (("-P" "%p") ("-scp") ("-p" "%k")))
+            (tramp-copy-args            (("-P" "%p") ("-scp") ("-p" "%k")
+                                         ("-r")))
             (tramp-copy-keep-date       t)
+            (tramp-copy-recursive       t)
             (tramp-password-end-of-line "xy") ;see docstring for "xy"
             (tramp-default-port         22))
     ("psftp" (tramp-login-program        "plink")
@@ -649,8 +654,10 @@ detected as prompt when being sent on echoing hosts, therefore.")
                                          ("-ssh") ("%h")))
             (tramp-remote-sh            "/bin/sh")
             (tramp-copy-program         "pscp")
-            (tramp-copy-args            (("-P" "%p") ("-sftp") ("-p" "%k")))
+            (tramp-copy-args            (("-P" "%p") ("-sftp") ("-p" "%k")
+                                         ("-r")))
             (tramp-copy-keep-date       t)
+            (tramp-copy-recursive       t)
             (tramp-password-end-of-line "xy")) ;see docstring for "xy"
     ("fcp"   (tramp-login-program        "fsh")
              (tramp-login-args           (("%h") ("-l" "%u") ("sh" "-i")))