diff options
| author | Miles Bader <miles@gnu.org> | 2006-01-20 03:44:29 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-01-20 03:44:29 +0000 |
| commit | e499bc94d642380257a49eeaf8049f9a8039a9a7 (patch) | |
| tree | 5d89d95f94467187fae465a99cbff56c73c75dde /lisp/gnus/mm-bodies.el | |
| parent | d322eb9b19ddba8ef604dd9d3e096be16a70fafe (diff) | |
| download | emacs-e499bc94d642380257a49eeaf8049f9a8039a9a7.tar.gz | |
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-5
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (base, patch 1-3)
- tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
- Update from CVS
- Merge from emacs--devo--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 187)
- Update from CVS
Diffstat (limited to 'lisp/gnus/mm-bodies.el')
| -rw-r--r-- | lisp/gnus/mm-bodies.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el index 8b47989e563..c58eb6bd41d 100644 --- a/lisp/gnus/mm-bodies.el +++ b/lisp/gnus/mm-bodies.el @@ -1,7 +1,7 @@ ;;; mm-bodies.el --- Functions for decoding MIME things ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; MORIOKA Tomohiko <morioka@jaist.ac.jp> @@ -249,7 +249,8 @@ decoding. If it is nil, default to `mail-parse-charset'." (save-excursion (when encoding (mm-decode-content-transfer-encoding encoding type)) - (when (featurep 'mule) ; Fixme: Wrong test for unibyte session. + (when (and (featurep 'mule) ;; Fixme: Wrong test for unibyte session. + (not (eq charset 'gnus-decoded))) (let ((coding-system (mm-charset-to-coding-system charset))) (if (and (not coding-system) (listp mail-parse-ignored-charsets) @@ -262,8 +263,7 @@ decoding. If it is nil, default to `mail-parse-charset'." ;;in XEmacs (mm-multibyte-p) (or (not (eq coding-system 'ascii)) - (setq coding-system mail-parse-charset)) - (not (eq coding-system 'gnus-decoded))) + (setq coding-system mail-parse-charset))) (mm-decode-coding-region (point-min) (point-max) coding-system)) (setq buffer-file-coding-system |