diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 55ffe1e253f..70c3b7b434d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2009-07-15 Kenichi Handa <handa@m17n.org> + * international/mule-cmds.el (set-language-environment-charset): + If coding-system-charset-list returns `iso-2022' or `emacs-mule', + ignore them. + * language/misc-lang.el ("IPA"): Change coding systems to utf-8. Delete unibyte-display. diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index e67c8ea5e5c..a3ab25095ab 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2035,7 +2035,9 @@ See `set-language-info-alist' for use in programs." ;; coding systems of higher priorities in this environment. (let ((charsets (get-language-info language-name 'charset))) (dolist (coding (get-language-info language-name 'coding-priority)) - (setq charsets (append charsets (coding-system-charset-list coding)))) + (let ((list (coding-system-charset-list coding))) + (if (consp list) + (setq charsets (append charsets list))))) (if charsets (apply 'set-charset-priority charsets)))) |