Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-513

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 103)

   - Update from CVS

2005-08-05  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/mm-bodies.el (mm-encode-body): Use coding system rather than
   charset to encode text.

   * lisp/gnus/mm-util.el (mm-find-mime-charset-region): Attempt to reduce the
   number of charsets if utf-8 is available (XEmacs).

3 files changed, 22 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0efec1e14c1..9f5ee5e1e33 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-art.el (article-unsplit-urls): Don't anchor urls to the
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index f58a840fbdd..23900d0cbec 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/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>
@@ -95,7 +95,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/gnus/mm-util.el b/lisp/gnus/mm-util.el
index a57389f59c4..512fee70863 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -766,6 +766,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)