Mercurial > emacs

diff lisp/net/tramp-sh.el @ 112020:9780afa403a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* net/tramp.el (tramp-default-user-alist): Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored.
author Michael Albinus <michael.albinus@gmx.de>
date Mon, 27 Dec 2010 11:56:26 +0100
parents ec45dfa69a06
children 209df3f0dcc6
line wrap: on
line diff
--- 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)))