diff options
| author | Miles Bader <miles@gnu.org> | 2006-04-21 05:39:14 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-04-21 05:39:14 +0000 |
| commit | 7e635d0ed3c42e6e779821f5c0c1c62289f4c1ee (patch) | |
| tree | dc3853824edd4a6d426ab69a584a70c53a230dd0 /lisp/gnus/mm-bodies.el | |
| parent | cfc2051d0ed5a268528a647ab0911a2f5cc451de (diff) | |
| parent | f67d6742cb77a21087e40ae7ee4c84556ca18970 (diff) | |
| download | emacs-7e635d0ed3c42e6e779821f5c0c1c62289f4c1ee.tar.gz emacs-7e635d0ed3c42e6e779821f5c0c1c62289f4c1ee.tar.bz2 emacs-7e635d0ed3c42e6e779821f5c0c1c62289f4c1ee.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-57
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 226-238)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo.
* gnus--rel--5.10 (patch 86-90)
- Update from CVS
- Merge from emacs--devo--0
Diffstat (limited to 'lisp/gnus/mm-bodies.el')
| -rw-r--r-- | lisp/gnus/mm-bodies.el | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el index 7871ca9f253..a1d51a1b9ea 100644 --- a/lisp/gnus/mm-bodies.el +++ b/lisp/gnus/mm-bodies.el @@ -56,6 +56,8 @@ ;; known to break servers. ;; Note: UTF-16 variants are invalid for text parts [RFC 2781], ;; so this can't happen :-/. + ;; PPS: Yes, it can happen if the user specifies UTF-16 in the MML + ;; markup. - jh. (utf-16 . base64) (utf-16be . base64) (utf-16le . base64)) @@ -250,7 +252,10 @@ decoding. If it is nil, default to `mail-parse-charset'." (mm-decode-content-transfer-encoding encoding type)) (when (and (featurep 'mule) ;; Fixme: Wrong test for unibyte session. (not (eq charset 'gnus-decoded))) - (let ((coding-system (mm-charset-to-coding-system charset))) + (let ((coding-system (mm-charset-to-coding-system + ;; Allow overwrite using + ;; `mm-charset-override-alist'. + charset nil t))) (if (and (not coding-system) (listp mail-parse-ignored-charsets) (memq 'gnus-unknown mail-parse-ignored-charsets)) @@ -281,7 +286,11 @@ decoding. If it is nil, default to `mail-parse-charset'." (setq charset mail-parse-charset)) (or (when (featurep 'mule) - (let ((coding-system (mm-charset-to-coding-system charset))) + (let ((coding-system (mm-charset-to-coding-system + charset + ;; Allow overwrite using + ;; `mm-charset-override-alist'. + nil t))) (if (and (not coding-system) (listp mail-parse-ignored-charsets) (memq 'gnus-unknown mail-parse-ignored-charsets)) |