From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Mon, 9 Jul 2012 02:12:51 +0000 (+0000)
Subject: mm-decode.el (mm-shr): Allow overriding charset by mm-charset-override-alist
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=6d942f0a7e11bef0dddeb29736346493ffa0f4eb

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20cb5f40b..6cf41e6bc 100644
--- a/lisp/ChangeLog
+++ b/lisp/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/mm-decode.el b/lisp/mm-decode.el
index d0401bc9d..7982b745d 100644
--- a/lisp/mm-decode.el
+++ b/lisp/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)))