* net/tramp-sh.el (tramp-default-user-alist): Don't add "plink",

"plink1" and "psftp".  (Bug#10530)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cbedfa2..63679e1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,9 @@
-20122-01-21  Kenichi Handa  <handa@m17n.org>
+2012-01-21  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp-sh.el (tramp-default-user-alist): Don't add "plink",
+       "plink1" and "psftp".  (Bug#10530)
+
+2012-01-21  Kenichi Handa  <handa@m17n.org>
 
        * international/mule-cmds.el (prefer-coding-system): Show a
        warning message if the default value of file-name-coding-system

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 2478253..e078a22 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -419,13 +419,13 @@ detected as prompt when being sent on echoing hosts, therefore.")
             `(,(concat "\\`" (regexp-opt '("su" "sudo" "ksu")) "\\'")
               nil "root"))
 ;; Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored.
+;; Do not add "plink" and "psftp", they ask interactively for the user.
 ;;;###tramp-autoload
 (add-to-list 'tramp-default-user-alist
             `(,(concat
                 "\\`"
                 (regexp-opt
-                 '("rcp" "remcp" "rsh" "telnet" "krlogin"
-                   "plink" "plink1" "pscp" "psftp" "fcp"))
+                 '("rcp" "remcp" "rsh" "telnet" "krlogin" "pscp" "fcp"))
                 "\\'")
               nil ,(user-login-name)))