summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2010-12-31 20:57:05 +0100
committerMichael Albinus <michael.albinus@gmx.de>2010-12-31 20:57:05 +0100
commit8d68c659a6e79745bc1350252751803cecb0e150 (patch)
tree731e9d4518cce32e9ad22d803b805f338f3f2ece /lisp/net
parentaeb7e9515c39a0dc3218b4fd3196ff7d27a50ee8 (diff)
downloademacs-8d68c659a6e79745bc1350252751803cecb0e150.tar.gz
* net/tramp-sh.el (tramp-methods): Add recursive options to "scpc"
and "scpx".
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/tramp-sh.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 86948bbc69b..9950709bd7a 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -161,10 +161,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") ("%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 @@ 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 (("%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")))