aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorMichael Albinus2012-01-21 17:02:53 +0100
committerMichael Albinus2012-01-21 17:02:53 +0100
commitcc6d5805ba054948ee5151e93b4b1318e2a4f5b2 (patch)
tree9100af58f4f8873e9d392779e1fd8b2997124983 /lisp/ChangeLog
parent3c2907f7e83d2a324aca245b5cb1b8c84a1055e7 (diff)
downloademacs-cc6d5805ba054948ee5151e93b4b1318e2a4f5b2.tar.gz
emacs-cc6d5805ba054948ee5151e93b4b1318e2a4f5b2.zip
* net/tramp-sh.el (tramp-default-user-alist): Don't add "plink",
"plink1" and "psftp". (Bug#10530)
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cbedfa287fa..63679e1580f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,9 @@
120122-01-21 Kenichi Handa <handa@m17n.org> 12012-01-21 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-sh.el (tramp-default-user-alist): Don't add "plink",
4 "plink1" and "psftp". (Bug#10530)
5
62012-01-21 Kenichi Handa <handa@m17n.org>
2 7
3 * international/mule-cmds.el (prefer-coding-system): Show a 8 * international/mule-cmds.el (prefer-coding-system): Show a
4 warning message if the default value of file-name-coding-system 9 warning message if the default value of file-name-coding-system