[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100342: * net/tramp.el (tramp-methods): Add recursive options to "scpc",

[Michael Albinus]

------------------------------------------------------------
revno: 100342
committer: Michael Albinus <address@hidden>
branch nick: emacs-23
timestamp: Fri 2010-12-31 21:17:53 +0100
message:
  * net/tramp.el (tramp-methods): Add recursive options to "scpc",
  "scpx", "pscp" and "psftp".
  
  Please do not sync with the trunk.
modified:
  lisp/ChangeLog
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-31 12:38:06 +0000
+++ b/lisp/ChangeLog    2010-12-31 20:17:53 +0000
@@ -1,3 +1,8 @@
+2010-12-31  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-methods): Add recursive options to "scpc",
+       "scpx", "pscp" and "psftp".
+
 2010-12-31  Eli Zaretskii  <address@hidden>
 
        * term/w32-win.el (image-library-alist): Set up correctly for

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2010-12-10 04:14:57 +0000
+++ b/lisp/net/tramp.el 2010-12-31 20:17:53 +0000
@@ -553,10 +553,11 @@
             (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" "address@hidden:%%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 @@
             (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 @@
                                          ("-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 @@
                                          ("-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")))