Commit 01e62600 authored by Michael Albinus's avatar Michael Albinus

* net/tramp.el (tramp-methods): Add recursive options to "scpc",

"scpx", "pscp" and "psftp".

Please do not sync with the trunk.
parent 18da2e74
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> 2010-12-31 Eli Zaretskii <eliz@gnu.org>
* term/w32-win.el (image-library-alist): Set up correctly for * term/w32-win.el (image-library-alist): Set up correctly for
......
...@@ -553,10 +553,11 @@ detected as prompt when being sent on echoing hosts, therefore.") ...@@ -553,10 +553,11 @@ detected as prompt when being sent on echoing hosts, therefore.")
(tramp-async-args (("-q"))) (tramp-async-args (("-q")))
(tramp-remote-sh "/bin/sh") (tramp-remote-sh "/bin/sh")
(tramp-copy-program "scp") (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" "ControlPath=%t.%%r@%%h:%%p")
("-o" "ControlMaster=auto"))) ("-o" "ControlMaster=auto")))
(tramp-copy-keep-date t) (tramp-copy-keep-date t)
(tramp-copy-recursive t)
(tramp-password-end-of-line nil) (tramp-password-end-of-line nil)
(tramp-gw-args (("-o" (tramp-gw-args (("-o"
"GlobalKnownHostsFile=/dev/null") "GlobalKnownHostsFile=/dev/null")
...@@ -570,8 +571,10 @@ detected as prompt when being sent on echoing hosts, therefore.") ...@@ -570,8 +571,10 @@ detected as prompt when being sent on echoing hosts, therefore.")
(tramp-async-args (("-q"))) (tramp-async-args (("-q")))
(tramp-remote-sh "/bin/sh") (tramp-remote-sh "/bin/sh")
(tramp-copy-program "scp") (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-keep-date t)
(tramp-copy-recursive t)
(tramp-password-end-of-line nil) (tramp-password-end-of-line nil)
(tramp-gw-args (("-o" (tramp-gw-args (("-o"
"GlobalKnownHostsFile=/dev/null") "GlobalKnownHostsFile=/dev/null")
...@@ -640,8 +643,10 @@ detected as prompt when being sent on echoing hosts, therefore.") ...@@ -640,8 +643,10 @@ detected as prompt when being sent on echoing hosts, therefore.")
("-ssh") ("%h"))) ("-ssh") ("%h")))
(tramp-remote-sh "/bin/sh") (tramp-remote-sh "/bin/sh")
(tramp-copy-program "pscp") (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-keep-date t)
(tramp-copy-recursive t)
(tramp-password-end-of-line "xy") ;see docstring for "xy" (tramp-password-end-of-line "xy") ;see docstring for "xy"
(tramp-default-port 22)) (tramp-default-port 22))
("psftp" (tramp-login-program "plink") ("psftp" (tramp-login-program "plink")
...@@ -649,8 +654,10 @@ detected as prompt when being sent on echoing hosts, therefore.") ...@@ -649,8 +654,10 @@ detected as prompt when being sent on echoing hosts, therefore.")
("-ssh") ("%h"))) ("-ssh") ("%h")))
(tramp-remote-sh "/bin/sh") (tramp-remote-sh "/bin/sh")
(tramp-copy-program "pscp") (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-keep-date t)
(tramp-copy-recursive t)
(tramp-password-end-of-line "xy")) ;see docstring for "xy" (tramp-password-end-of-line "xy")) ;see docstring for "xy"
("fcp" (tramp-login-program "fsh") ("fcp" (tramp-login-program "fsh")
(tramp-login-args (("%h") ("-l" "%u") ("sh" "-i"))) (tramp-login-args (("%h") ("-l" "%u") ("sh" "-i")))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment