gnus-article-html: Decode contents by charset.

2 files changed, 11 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index af7fa8460dd..16c90ac61e8 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,9 @@
 2010-09-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+        * gnus-html.el (gnus-article-html): Decode contents by charset.
+
+2010-09-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
         * gnus-html.el (gnus-html-cache-directory, gnus-html-cache-size)
         (gnus-html-frame-width, gnus-blocked-images)
         * message.el (message-prune-recipient-rules): Add custom version.
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 0c3ad4b045c..8a7fae1fe9a 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -66,7 +66,13 @@
           (let* ((coding-system-for-read 'utf-8)
                  (coding-system-for-write 'utf-8)
                  (default-process-coding-system
-                   (cons coding-system-for-read coding-system-for-write)))
+                   (cons coding-system-for-read coding-system-for-write))
+                 (charset (mail-content-type-get (mm-handle-type handle)
+                                                 'charset)))
+            (when (and charset
+                       (setq charset (mm-charset-to-coding-system charset))
+                       (not (eq charset 'ascii)))
+              (mm-decode-coding-region (point-min) (point-max) charset))
             (call-process-region (point-min) (point-max)
                                  "w3m" 
                                  nil article-buffer nil