[Emacs-diffs] emacs/lisp/international mule-cmds.el

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/07/15 12:28:17

Modified files:
        lisp/international: mule-cmds.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/international/mule-cmds.el?cvsroot=emacs&r1=1.361&r2=1.362

Patches:
Index: mule-cmds.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/mule-cmds.el,v
retrieving revision 1.361
retrieving revision 1.362
diff -u -b -r1.361 -r1.362
--- mule-cmds.el        7 Jul 2009 06:27:53 -0000       1.361
+++ mule-cmds.el        15 Jul 2009 12:28:09 -0000      1.362
@@ -2035,7 +2035,9 @@
   ;; 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))))