Mercurial > emacs
changeset 112020:9780afa403a4
* 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 | 359425b45529 |
| children | 6ce864f1550e |
| files | lisp/ChangeLog lisp/net/tramp-sh.el |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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)))