aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorMichael Albinus2008-04-07 19:29:09 +0000
committerMichael Albinus2008-04-07 19:29:09 +0000
commit60f2c210c0bbbfb1b2d3085aac4159126a26836e (patch)
tree2803203753797e80b616e80700ab31b27d0cd44f /lisp
parentdff6f37f72e54337f463f93c1bf22a82a62b013d (diff)
downloademacs-60f2c210c0bbbfb1b2d3085aac4159126a26836e.tar.gz
emacs-60f2c210c0bbbfb1b2d3085aac4159126a26836e.zip
* net/tramp.el (tramp-methods): Fix again tramp-copy-args of
"pscp" and "psftp". Reported by Gilles Pion <gpion@lfdj.com>.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/tramp.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 2829d13466e..52060371d12 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -535,7 +535,7 @@ files conditionalize this setup based on the TERM environment variable."
535 ("-ssh"))) 535 ("-ssh")))
536 (tramp-remote-sh "/bin/sh") 536 (tramp-remote-sh "/bin/sh")
537 (tramp-copy-program "pscp") 537 (tramp-copy-program "pscp")
538 (tramp-copy-args (("-P") ("%p") ("-scp") ("-p" "%k"))) 538 (tramp-copy-args (("-P" "%p") ("-scp") ("-p" "%k")))
539 (tramp-copy-keep-date t) 539 (tramp-copy-keep-date t)
540 (tramp-password-end-of-line "xy") ;see docstring for "xy" 540 (tramp-password-end-of-line "xy") ;see docstring for "xy"
541 (tramp-default-port 22)) 541 (tramp-default-port 22))
@@ -544,7 +544,7 @@ files conditionalize this setup based on the TERM environment variable."
544 ("-ssh"))) 544 ("-ssh")))
545 (tramp-remote-sh "/bin/sh") 545 (tramp-remote-sh "/bin/sh")
546 (tramp-copy-program "pscp") 546 (tramp-copy-program "pscp")
547 (tramp-copy-args (("-P") ("%p") ("-sftp") ("-p" "%k"))) 547 (tramp-copy-args (("-P" "%p") ("-sftp") ("-p" "%k")))
548 (tramp-copy-keep-date t) 548 (tramp-copy-keep-date t)
549 (tramp-password-end-of-line "xy")) ;see docstring for "xy" 549 (tramp-password-end-of-line "xy")) ;see docstring for "xy"
550 ("fcp" (tramp-login-program "fsh") 550 ("fcp" (tramp-login-program "fsh")