[Emacs-diffs] /srv/bzr/emacs/trunk r108959: mm-decode.el (mm-shr): Allow overriding charset by mm-charset-override-alist

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 108959
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-09 02:13:07 +0000
message:
  mm-decode.el (mm-shr): Allow overriding charset by mm-charset-override-alist
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mm-decode.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-07-03 00:25:57 +0000
+++ b/lisp/gnus/ChangeLog       2012-07-09 02:13:07 +0000
@@ -1,3 +1,8 @@
+2012-07-09  Katsumi Yamaoka  <address@hidden>
+
+       * mm-decode.el (mm-shr):
+       Allow overriding charset by mm-charset-override-alist.
+
 2012-07-03  Katsumi Yamaoka  <address@hidden>
 
        * gnus-art.el (gnus-article-view-part):

=== modified file 'lisp/gnus/mm-decode.el'
--- a/lisp/gnus/mm-decode.el    2012-06-26 22:52:31 +0000
+++ b/lisp/gnus/mm-decode.el    2012-07-09 02:13:07 +0000
@@ -1772,7 +1772,8 @@
         (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)))