diff options
| author | Michael Albinus | 2010-12-31 20:57:05 +0100 |
|---|---|---|
| committer | Michael Albinus | 2010-12-31 20:57:05 +0100 |
| commit | 8d68c659a6e79745bc1350252751803cecb0e150 (patch) | |
| tree | 731e9d4518cce32e9ad22d803b805f338f3f2ece /lisp | |
| parent | aeb7e9515c39a0dc3218b4fd3196ff7d27a50ee8 (diff) | |
| download | emacs-8d68c659a6e79745bc1350252751803cecb0e150.tar.gz emacs-8d68c659a6e79745bc1350252751803cecb0e150.zip | |
* net/tramp-sh.el (tramp-methods): Add recursive options to "scpc"
and "scpx".
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6a7bcf9745b..8e693845a4f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-12-31 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-sh.el (tramp-methods): Add recursive options to "scpc" | ||
| 4 | and "scpx". | ||
| 5 | |||
| 1 | 2010-12-30 Tassilo Horn <tassilo@member.fsf.org> | 6 | 2010-12-30 Tassilo Horn <tassilo@member.fsf.org> |
| 2 | 7 | ||
| 3 | * doc-view.el (doc-view-set-doc-type): New function refactored | 8 | * doc-view.el (doc-view-set-doc-type): New function refactored |
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.") | |||
| 161 | (tramp-async-args (("-q"))) | 161 | (tramp-async-args (("-q"))) |
| 162 | (tramp-remote-sh "/bin/sh") | 162 | (tramp-remote-sh "/bin/sh") |
| 163 | (tramp-copy-program "scp") | 163 | (tramp-copy-program "scp") |
| 164 | (tramp-copy-args (("-P" "%p") ("%k" "-p") ("-q") | 164 | (tramp-copy-args (("-P" "%p") ("%k" "-p") ("-q") ("-r") |
| 165 | ("-o" "ControlPath=%t.%%r@%%h:%%p") | 165 | ("-o" "ControlPath=%t.%%r@%%h:%%p") |
| 166 | ("-o" "ControlMaster=auto"))) | 166 | ("-o" "ControlMaster=auto"))) |
| 167 | (tramp-copy-keep-date t) | 167 | (tramp-copy-keep-date t) |
| 168 | (tramp-copy-recursive t) | ||
| 168 | (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") | 169 | (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") |
| 169 | ("-o" "UserKnownHostsFile=/dev/null") | 170 | ("-o" "UserKnownHostsFile=/dev/null") |
| 170 | ("-o" "StrictHostKeyChecking=no"))) | 171 | ("-o" "StrictHostKeyChecking=no"))) |
| @@ -179,8 +180,9 @@ detected as prompt when being sent on echoing hosts, therefore.") | |||
| 179 | (tramp-async-args (("-q"))) | 180 | (tramp-async-args (("-q"))) |
| 180 | (tramp-remote-sh "/bin/sh") | 181 | (tramp-remote-sh "/bin/sh") |
| 181 | (tramp-copy-program "scp") | 182 | (tramp-copy-program "scp") |
| 182 | (tramp-copy-args (("%k" "-p"))) | 183 | (tramp-copy-args (("-P" "%p") ("%k" "-p") ("-q") ("-r"))) |
| 183 | (tramp-copy-keep-date t) | 184 | (tramp-copy-keep-date t) |
| 185 | (tramp-copy-recursive t) | ||
| 184 | (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") | 186 | (tramp-gw-args (("-o" "GlobalKnownHostsFile=/dev/null") |
| 185 | ("-o" "UserKnownHostsFile=/dev/null") | 187 | ("-o" "UserKnownHostsFile=/dev/null") |
| 186 | ("-o" "StrictHostKeyChecking=no"))) | 188 | ("-o" "StrictHostKeyChecking=no"))) |