aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2012-01-18 10:11:15 +0900
committerKenichi Handa2012-01-18 10:11:15 +0900
commit71784361eb381ec2b12bd8283724a7addec49079 (patch)
tree4547bbe1edcb4ab87f5fad0cbb95c8b48e8d986a
parent9858f6c326dfad35733b0dc86231bdd97f2b7703 (diff)
downloademacs-71784361eb381ec2b12bd8283724a7addec49079.tar.gz
emacs-71784361eb381ec2b12bd8283724a7addec49079.zip
international/mule-cmds.el (prefer-coding-system): Show a warning message if the default value of file-name-coding-system was not changed.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/international/mule-cmds.el5
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37286d0780c..f900c7dfa50 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12011-12-30 Kenichi Handa <handa@m17n.org>
2
3 * international/mule-cmds.el (prefer-coding-system): Show a
4 warning message if the default value of file-name-coding-system
5 was not changed.
6
12011-12-29 Michael Albinus <michael.albinus@gmx.de> 72011-12-29 Michael Albinus <michael.albinus@gmx.de>
2 8
3 * net/tramp-sh.el (tramp-find-shell): Set "remote-shell" property 9 * net/tramp-sh.el (tramp-find-shell): Set "remote-shell" property
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 0d3f079866e..94b5724c016 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -418,7 +418,10 @@ To prefer, for instance, utf-8, say the following:
418 (if (memq eol-type '(0 1 2)) 418 (if (memq eol-type '(0 1 2))
419 (setq base 419 (setq base
420 (coding-system-change-eol-conversion base eol-type))) 420 (coding-system-change-eol-conversion base eol-type)))
421 (set-default-coding-systems base))) 421 (set-default-coding-systems base)
422 (if (called-interactively-p 'interactive)
423 (or (eq base default-file-name-coding-system)
424 (message "The default value of `file-name-coding-system' was not changed because the specified coding system is not suitable for file names.")))))
422 425
423(defvar sort-coding-systems-predicate nil 426(defvar sort-coding-systems-predicate nil
424 "If non-nil, a predicate function to sort coding systems. 427 "If non-nil, a predicate function to sort coding systems.