From: yamaoka <yamaoka>
Date: Wed, 19 Oct 2005 22:43:59 +0000 (+0000)
Subject: Synch to No Gnus 200510191619.
X-Git-Tag: t-gnus-6_17_4-quimby-~293
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=dbd417b2ce93c17132a293deed8ba7f0ce5fed46;p=elisp%2Fgnus.git-

Synch to No Gnus 200510191619.
---

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  <Reiner.Steib@gmx.de>
+
+	* mm-bodies.el (mm-decode-string): Call
+	`mm-charset-to-coding-system' with allow-override argument.
+
 2005-10-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* 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))