Synch to No Gnus 200508050558.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd052d5..e031d81 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-05  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-bodies.el (mm-encode-body): Use coding system rather than
+       charset to encode text.
+
+       * mm-util.el (mm-find-mime-charset-region): Attempt to reduce the
+       number of charsets if utf-8 is available (XEmacs).
+
 2005-08-04  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-art.el (gnus-button-valid-localpart-regexp): New variable

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index e6aeb05..be37160 100644 (file)
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -1,6 +1,6 @@
 ;;; mm-bodies.el --- Functions for decoding MIME things
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004
+;; Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -93,7 +93,8 @@ If no encoding was done, nil is returned."
     (save-excursion
       (if charset
          (progn
-           (mm-encode-coding-region (point-min) (point-max) charset)
+           (mm-encode-coding-region (point-min) (point-max)
+                                    (mm-charset-to-coding-system charset))
            charset)
        (goto-char (point-min))
        (let ((charsets (mm-find-mime-charset-region (point-min) (point-max)

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index f56a3ee..1b152fc 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -750,6 +750,17 @@ charset, and a longer list means no appropriate charset."
     (if (and (memq 'iso-2022-jp-2 charsets)
             (memq 'iso-2022-jp-2 hack-charsets))
        (setq charsets (delq 'iso-2022-jp charsets)))
+    ;; Attempt to reduce the number of charsets if utf-8 is available.
+    (if (and (featurep 'xemacs)
+            (> (length charsets) 1)
+            (mm-coding-system-p 'utf-8))
+       (let ((mm-coding-system-priorities
+              (cons 'utf-8 mm-coding-system-priorities)))
+         (setq charsets
+               (mm-delete-duplicates
+                (mapcar 'mm-mime-charset
+                        (delq 'ascii
+                              (mm-find-charset-region b e)))))))
     charsets))
 
 (defmacro mm-with-unibyte-buffer (&rest forms)