# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1293447386 -3600
# Node ID 9780afa403a4f20546eb73f8ebd0ec376a160006
# Parent  359425b455298e894f6c8f61e9e9d55698dc4cd9
* net/tramp.el (tramp-default-user-alist): Do not add "ssh" based
methods, otherwise ~/.ssh/config would be ignored.

diff -r 359425b45529 -r 9780afa403a4 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Dec 27 18:46:02 2010 +0900
+++ b/lisp/ChangeLog	Mon Dec 27 11:56:26 2010 +0100
@@ -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 -r 359425b45529 -r 9780afa403a4 lisp/net/tramp-sh.el
--- a/lisp/net/tramp-sh.el	Mon Dec 27 18:46:02 2010 +0900
+++ b/lisp/net/tramp-sh.el	Mon Dec 27 11:56:26 2010 +0100
@@ -386,13 +386,13 @@
 (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)))