diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2010-12-27 11:56:26 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2010-12-27 11:56:26 +0100 |
| commit | fe99f70420c0d133808de6f0b67406e38abc57a5 (patch) | |
| tree | 3c4138ab79d4373326a0b5ea263afa5794d6f84d /lisp/net/tramp-sh.el | |
| parent | fdee7cc1ac2d03ba7ba80349170b37bdc3d3d819 (diff) | |
| download | emacs-fe99f70420c0d133808de6f0b67406e38abc57a5.tar.gz | |
* net/tramp.el (tramp-default-user-alist): Do not add "ssh" based
methods, otherwise ~/.ssh/config would be ignored.
Diffstat (limited to 'lisp/net/tramp-sh.el')
| -rw-r--r-- | lisp/net/tramp-sh.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 6bd3043a718..d5fa4eb76e8 100644 --- 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))) |