Synch to No Gnus 200406290556.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05d7e8d..424e347 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2004-06-29  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * mm-view.el (mm-inline-render-with-function): Use multibyte
+       buffer; decode html source by charset.
+
        * mm-encode.el (mm-content-transfer-encoding-defaults): Doc fix.
 
        * mm-util.el (mm-mime-mule-charset-alist): Add the windows-1251

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index bbc52c2..3e2d7e3 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -299,11 +299,14 @@
        (buffer-string)))))
 
 (defun mm-inline-render-with-function (handle func &rest args)
-  (let ((source (mm-get-part handle)))
+  (let ((source (mm-get-part handle))
+       (charset (mail-content-type-get (mm-handle-type handle) 'charset)))
     (mm-insert-inline
      handle
-     (mm-with-unibyte-buffer
-       (insert source)
+     (mm-with-multibyte-buffer
+       (insert (if charset
+                  (mm-decode-string source charset)
+                source))
        (apply func args)
        (buffer-string)))))