# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1293826673 -3600
# Node ID ee29e7a182bf2f5e9634e579f5b8183ddb181a26
# Parent  1d9002cd082f5c58861b0faa9412c3b8a9d2c623
* net/tramp.el (tramp-methods): Add recursive options to "scpc",
"scpx", "pscp" and "psftp".

Please do not sync with the trunk.

diff -r 1d9002cd082f -r ee29e7a182bf lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 31 18:33:40 2010 +0200
+++ b/lisp/ChangeLog	Fri Dec 31 21:17:53 2010 +0100
@@ -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 -r 1d9002cd082f -r ee29e7a182bf lisp/net/tramp.el
--- a/lisp/net/tramp.el	Fri Dec 31 18:33:40 2010 +0200
+++ b/lisp/net/tramp.el	Fri Dec 31 21:17:53 2010 +0100
@@ -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" "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 @@
 	     (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")))