mm-decode.el (mm-shr): Allow overriding charset by mm-charset-override-alist

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 58a3b879361df46c4773e1fb7c5cc2541901fb55..beb3cc2cf9418a2ac893ce41717351876af732bd 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-decode.el (mm-shr):
+       Allow overriding charset by mm-charset-override-alist.
+
 2012-07-03  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-view-part):

diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index d0401bc9de367538fc5d5b750a4697d004ebe88c..7982b745d6600bc2e95ceea84255ab6b60fdf900 100644 (file)
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1772,7 +1772,8 @@ If RECURSIVE, search recursively."
         (insert (prog1
                     (if (and charset
                              (setq charset
-                                   (mm-charset-to-coding-system charset))
+                                   (mm-charset-to-coding-system charset
+                                                                nil t))
                              (not (eq charset 'ascii)))
                         (mm-decode-coding-string (buffer-string) charset)
                       (mm-string-as-multibyte (buffer-string)))