(mm-coding-system-priorities): Allow the valu like "Japanese (UTF-8)" of

 current-language-environment.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfd7693..dad6c88 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-util.el (mm-coding-system-priorities): Allow the valu like
+       "Japanese (UTF-8)" of current-language-environment.
+
 2009-01-08  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * imap.el (imap-enable-exchange-bug-workaround): Explain auto-detection

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 3d8538d..c1fb1a6 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -842,7 +842,8 @@ Valid elements include:
 (defcustom mm-coding-system-priorities
   (if (boundp 'current-language-environment)
       (let ((lang (symbol-value 'current-language-environment)))
-       (cond ((string= lang "Japanese")
+       (cond (;; In XEmacs 21.5 it may be the one like "Japanese (UTF-8)".
+              (string-match "\\`Japanese" lang)
               ;; Japanese users prefer iso-2022-jp to euc-japan or
               ;; shift_jis, however iso-8859-1 should be used when
               ;; there are only ASCII text and Latin-1 characters.