From dbd417b2ce93c17132a293deed8ba7f0ce5fed46 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 19 Oct 2005 22:43:59 +0000 Subject: [PATCH] Synch to No Gnus 200510191619. --- lisp/ChangeLog | 5 +++++ lisp/mm-bodies.el | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3543c1f..dc6b2e7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-10-19 Reiner Steib + + * mm-bodies.el (mm-decode-string): Call + `mm-charset-to-coding-system' with allow-override argument. + 2005-10-19 Katsumi Yamaoka * rfc2047.el (rfc2047-allow-incomplete-encoded-text): New variable. diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el index b91a774..5822e4e 100644 --- a/lisp/mm-bodies.el +++ b/lisp/mm-bodies.el @@ -282,7 +282,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)) -- 1.7.10.4