* net/tramp.el (tramp-methods): Move hostname to the end in all

plink `tramp-login-args'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a4a0fa5c873b11d1fe11b02facbc7d5d63c5c64c..02e75a40b21745e8c3841d8e9a09d47c3f14c265 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-23  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-methods): Move hostname to the end in all
+       plink `tramp-login-args'.
+
 2010-07-23  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-open-shell): New defun.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0afc4c95799522f34307a474ad35a2bb983ccc69..2a4f57e20451fc0d46fd1a85d86829fe3783903e 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -599,8 +599,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
             (tramp-copy-keep-date       nil)
             (tramp-password-end-of-line nil))
     ("plink" (tramp-login-program        "plink")
-            (tramp-login-args           (("%h") ("-l" "%u") ("-P" "%p")
-                                         ("-ssh")))
+            (tramp-login-args           (("-l" "%u") ("-P" "%p")
+                                         ("-ssh") ("%h")))
             (tramp-remote-sh            "/bin/sh")
             (tramp-copy-program         nil)
             (tramp-copy-args            nil)
@@ -609,8 +609,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
             (tramp-default-port         22))
     ("plink1"
             (tramp-login-program        "plink")
-            (tramp-login-args           (("%h") ("-l" "%u") ("-P" "%p")
-                                         ("-1" "-ssh")))
+            (tramp-login-args           (("-l" "%u") ("-P" "%p")
+                                         ("-1" "-ssh") ("%h")))
             (tramp-remote-sh            "/bin/sh")
             (tramp-copy-program         nil)
             (tramp-copy-args            nil)
@@ -633,8 +633,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
             (tramp-copy-keep-date       nil)
             (tramp-password-end-of-line nil))
     ("pscp"  (tramp-login-program        "plink")
-            (tramp-login-args           (("%h") ("-l" "%u") ("-P" "%p")
-                                         ("-ssh")))
+            (tramp-login-args           (("-l" "%u") ("-P" "%p")
+                                         ("-ssh") ("%h")))
             (tramp-remote-sh            "/bin/sh")
             (tramp-copy-program         "pscp")
             (tramp-copy-args            (("-P" "%p") ("-scp") ("-p" "%k")))
@@ -642,8 +642,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
             (tramp-password-end-of-line "xy") ;see docstring for "xy"
             (tramp-default-port         22))
     ("psftp" (tramp-login-program        "plink")
-            (tramp-login-args           (("%h") ("-l" "%u") ("-P" "%p")
-                                         ("-ssh")))
+            (tramp-login-args           (("-l" "%u") ("-P" "%p")
+                                         ("-ssh") ("%h")))
             (tramp-remote-sh            "/bin/sh")
             (tramp-copy-program         "pscp")
             (tramp-copy-args            (("-P" "%p") ("-sftp") ("-p" "%k")))