Mercurial > emacs
changeset 112042:c92bc8723d4b
* net/tramp-sh.el (tramp-methods): Add recursive options to "scpc"
and "scpx".
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Fri, 31 Dec 2010 20:57:05 +0100 |
| parents | 9c611deb66fa |
| children | dffe14ef6b65 |
| files | lisp/ChangeLog lisp/net/tramp-sh.el |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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")))