Synch to No Gnus 200410290106.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2af9172..75c498b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-util.el (mm-coding-system-priorities): Prefer iso-8859-1 than
+       iso-2022-jp even in the Japanese language environment.  Suggested
+       by Jason Rumney <jasonr@gnu.org>.
+
 2004-10-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-sum.el (gnus-update-summary-mark-positions): Allow users to

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 50f0bca..6bd8af9 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -345,8 +345,10 @@ Valid elements include:
   (if (boundp 'current-language-environment)
       (let ((lang (symbol-value 'current-language-environment)))
        (cond ((string= lang "Japanese")
-              ;; Japanese users may prefer iso-2022-jp to shift_jis.
-              '(iso-2022-jp iso-2022-jp-2 shift_jis iso-8859-1 utf-8)))))
+              ;; 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.
+              '(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)))))
   "Preferred coding systems for encoding outgoing messages.
 
 More than one suitable coding system may be found for some text.