Mercurial > emacs
changeset 64736:f62cd60b99ba
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).
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 05 Aug 2005 08:48:40 +0000 |
| parents | bfabe4ff7114 |
| children | bae6ce9731e6 edf295560b5a |
| files | lisp/gnus/ChangeLog lisp/gnus/mm-bodies.el lisp/gnus/mm-util.el |
| diffstat | 3 files changed, 22 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Fri Aug 05 08:37:44 2005 +0000 +++ b/lisp/gnus/ChangeLog Fri Aug 05 08:48:40 2005 +0000 @@ -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
--- a/lisp/gnus/mm-bodies.el Fri Aug 05 08:37:44 2005 +0000 +++ b/lisp/gnus/mm-bodies.el Fri Aug 05 08:48:40 2005 +0000 @@ -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 @@ (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)
--- a/lisp/gnus/mm-util.el Fri Aug 05 08:37:44 2005 +0000 +++ b/lisp/gnus/mm-util.el Fri Aug 05 08:48:40 2005 +0000 @@ -766,6 +766,17 @@ (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)