From: Kenichi Handa <handa@m17n.org>
Date: Wed, 15 Jul 2009 12:29:30 +0000 (+0000)
Subject: (set-language-environment-charset):
X-Git-Tag: emacs-23.1~68
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d9bf399d59449dc8b7a66a5d3b1c30c46911914f;p=emacs.git

(set-language-environment-charset):
If coding-system-charset-list returns `iso-2022' or `emacs-mule',
ignore them.
---

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index ac94cadad06..a943a04e490 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2034,7 +2034,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))))