2000-10-20 19:55:59 ShengHuo ZHU <zsh@cs.rochester.edu>

	* gnus-art.el (gnus-mime-inline-part): Check validity of charset.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 435e617..36795d0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-20 19:55:59  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-art.el (gnus-mime-inline-part): Check validity of charset.
+

 2000-10-18  Dave Love  <fx@gnu.org>
 
        * mail-source.el (mm-util): Require.
 2000-10-18  Dave Love  <fx@gnu.org>
 
        * mail-source.el (mm-util): Require.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 8e35782..f7f7d39 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3061,9 +3061,11 @@ If ALL-HEADERS is non-nil, no headers are hidden."
                  (read-coding-system "Charset: ")))))
       (forward-line 2)
       (mm-insert-inline handle
                  (read-coding-system "Charset: ")))))
       (forward-line 2)
       (mm-insert-inline handle

-                       (if charset 
-                           (mm-decode-coding-string
-                            contents (mm-charset-to-coding-system charset))
+                       (if (and charset 
+                                (setq charset (mm-charset-to-coding-system 
+                                               charset))
+                                (not (eq charset 'ascii)))
+                           (mm-decode-coding-string contents charset)

                          contents))
       (goto-char b))))
 
                          contents))
       (goto-char b))))