(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 ac94cadad0679e6ba3576dde85be932fcfb6a50d..a943a04e4909172b4db82dae5653468784ec2aff 100644 (file)
--- 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))))