diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2010-12-31 21:17:53 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2010-12-31 21:17:53 +0100 |
| commit | 01e62600950418282e968a74b9163f70c03d8227 (patch) | |
| tree | f457e0fb2f4c95929d9e720bbc3a38696a326cea /lisp | |
| parent | 18da2e74f0df222de51b24ac516deab2680814ec (diff) | |
| download | emacs-01e62600950418282e968a74b9163f70c03d8227.tar.gz | |
* net/tramp.el (tramp-methods): Add recursive options to "scpc",
"scpx", "pscp" and "psftp".
Please do not sync with the trunk.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c38f6a87b14..4a89aca9ac4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/net/tramp.el b/lisp/net/tramp.el index babcc2ca250..16b02322c93 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -553,10 +553,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") ("-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 @@ 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" "%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 @@ detected as prompt when being sent on echoing hosts, therefore.") ("-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 @@ detected as prompt when being sent on echoing hosts, therefore.") ("-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"))) |