procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* net/tramp-sh.el (tramp-default-user-alist): Don't add "plink",

Browse source 
"plink1" and "psftp".  (Bug#10530)
This commit is contained in:
Michael Albinus 2012-01-21 17:02:53 +01:00
parent 3c2907f7e8
commit cc6d5805ba
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,4 +1,9 @@
20122-01-21 Kenichi Handa <handa@m17n.org>
2012-01-21 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-default-user-alist): Don't add "plink",
"plink1" and "psftp". (Bug#10530)
2012-01-21 Kenichi Handa <handa@m17n.org>
* international/mule-cmds.el (prefer-coding-system): Show a
warning message if the default value of file-name-coding-system

4
lisp/net/tramp-sh.el
View file

@ -419,13 +419,13 @@ detected as prompt when being sent on echoing hosts, therefore.")
`(,(concat "\\`" (regexp-opt '("su" "sudo" "ksu")) "\\'")
nil "root"))
;; Do not add "ssh" based methods, otherwise ~/.ssh/config would be ignored.
;; Do not add "plink" and "psftp", they ask interactively for the user.
;;;###tramp-autoload
(add-to-list 'tramp-default-user-alist
`(,(concat
"\\`"
(regexp-opt
'("rcp" "remcp" "rsh" "telnet" "krlogin"
"plink" "plink1" "pscp" "psftp" "fcp"))
'("rcp" "remcp" "rsh" "telnet" "krlogin" "pscp" "fcp"))
"\\'")
nil ,(user-login-name)))