[Emacs-diffs] /srv/bzr/emacs/trunk r106907: * net/tramp-sh.el (tramp-default-user-alist): Don't add "plink",

[Michael Albinus]

------------------------------------------------------------
revno: 106907
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sat 2012-01-21 17:02:53 +0100
message:
  * net/tramp-sh.el (tramp-default-user-alist): Don't add "plink",
  "plink1" and "psftp".  (Bug#10530)
modified:
  lisp/ChangeLog
  lisp/net/tramp-sh.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-21 11:36:42 +0000
+++ b/lisp/ChangeLog    2012-01-21 16:02:53 +0000
@@ -1,4 +1,9 @@
-20122-01-21  Kenichi Handa  <address@hidden>
+2012-01-21  Michael Albinus  <address@hidden>
+
+       * net/tramp-sh.el (tramp-default-user-alist): Don't add "plink",
+       "plink1" and "psftp".  (Bug#10530)
+
+2012-01-21  Kenichi Handa  <address@hidden>
 
        * international/mule-cmds.el (prefer-coding-system): Show a
        warning message if the default value of file-name-coding-system

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2012-01-15 16:03:30 +0000
+++ b/lisp/net/tramp-sh.el      2012-01-21 16:02:53 +0000
@@ -419,13 +419,13 @@
             `(,(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)))