* net/tramp.el (tramp-default-user-alist): Do not add "ssh" based

methods, otherwise ~/.ssh/config would be ignored.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21d90eee903a1c866898c6610a1e743ca47a3714..d49053085c196c6241a3fd27d2a4c000b769d26c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-27  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-default-user-alist): Do not add "ssh" based
+       methods, otherwise ~/.ssh/config would be ignored.
+
 2010-12-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/rx.el: Make it a superset of sregex.

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 6bd3043a7189f5cdda4dc280f355a019f5a29f68..d5fa4eb76e86a516bab2773818517a8f8b2f2d49 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -386,13 +386,13 @@ detected as prompt when being sent on echoing hosts, therefore.")
 (add-to-list 'tramp-default-user-alist
             `(,(concat "\\`" (regexp-opt '("su" "sudo" "ksu")) "\\'")
               nil "root"))
+;; Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored.
 (add-to-list 'tramp-default-user-alist
             `(,(concat
                 "\\`"
                 (regexp-opt
-                 '("rcp" "remcp" "scp" "scp1" "scp2" "scpc" "scpx" "sftp"
-                   "rsync" "rsyncc" "rsh" "remsh" "ssh" "ssh1" "ssh2" "sshx"
-                   "telnet" "krlogin" "plink" "plink1" "pscp" "psftp" "fcp"))
+                 '("rcp" "remcp" "rsh" "telnet" "krlogin"
+                   "plink" "plink1" "pscp" "psftp" "fcp"))
                 "\\'")
               nil ,(user-login-name)))