Commit fe99f704 authored by Michael Albinus's avatar Michael Albinus

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

methods, otherwise ~/.ssh/config would be ignored.
parent fdee7cc1
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.
......
......@@ -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)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment