gnus-article-html: Decode contents by charset.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index af7fa8460dd288967477f3da4cff427e85818432..16c90ac61e8835afc0a7ea20601160a1b59b1059 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+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)

diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 0c3ad4b045c23cfd58932fbe94334e35b2779815..8a7fae1fe9ae4b911332289d1d9a7b7ae6a14c94 100644 (file)
--- 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