# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1293825425 -3600
# Node ID c92bc8723d4bb2a2b49cc06c52a319a147163628
# Parent  9c611deb66fad237f434df7ac83d15de95fea6d6
* net/tramp-sh.el (tramp-methods): Add recursive options to "scpc"
and "scpx".

diff -r 9c611deb66fa -r c92bc8723d4b lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 31 14:16:16 2010 +0100
+++ b/lisp/ChangeLog	Fri Dec 31 20:57:05 2010 +0100
@@ -1,3 +1,8 @@
+2010-12-31  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-sh.el (tramp-methods): Add recursive options to "scpc"
+	and "scpx".
+
 2010-12-30  Tassilo Horn  <tassilo@member.fsf.org>
 
 	* doc-view.el (doc-view-set-doc-type): New function refactored
diff -r 9c611deb66fa -r c92bc8723d4b lisp/net/tramp-sh.el
--- a/lisp/net/tramp-sh.el	Fri Dec 31 14:16:16 2010 +0100
+++ b/lisp/net/tramp-sh.el	Fri Dec 31 20:57:05 2010 +0100
@@ -161,10 +161,11 @@
     (tramp-async-args           (("-q")))
     (tramp-remote-sh            "/bin/sh")
     (tramp-copy-program         "scp")
-    (tramp-copy-args            (("-P" "%p") ("%k" "-p") ("-q")
+    (tramp-copy-args            (("-P" "%p") ("%k" "-p") ("-q") ("-r")
 				 ("-o" "ControlPath=%t.%%r@%%h:%%p")
 				 ("-o" "ControlMaster=auto")))
     (tramp-copy-keep-date       t)
+    (tramp-copy-recursive       t)
     (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
 				 ("-o" "UserKnownHostsFile=/dev/null")
 				 ("-o" "StrictHostKeyChecking=no")))
@@ -179,8 +180,9 @@
     (tramp-async-args           (("-q")))
     (tramp-remote-sh            "/bin/sh")
     (tramp-copy-program         "scp")
-    (tramp-copy-args            (("%k" "-p")))
+    (tramp-copy-args            (("-P" "%p") ("%k" "-p") ("-q") ("-r")))
     (tramp-copy-keep-date       t)
+    (tramp-copy-recursive       t)
     (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
 				 ("-o" "UserKnownHostsFile=/dev/null")
 				 ("-o" "StrictHostKeyChecking=no")))