Fix double-decode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a12f1b..fb0fcd1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-03 13:36:46  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-art.el (article-decode-charset): Override non-MIME forward
+       charset.
+
 2000-06-02 12:04:26  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * mml.el (mml-quote-region): Correct the regexp.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 883c7ca..88d2a22 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1475,6 +1475,10 @@ If PROMPT (the prefix), prompt for a coding system to use."
     (forward-line 1)
     (save-restriction
       (narrow-to-region (point) (point-max))
+      (if (and (eq mail-parse-charset 'gnus-decoded)
+              (eq (mm-body-7-or-8) '8bit))
+         ;; The text code could have been decoded.
+         (setq charset mail-parse-charset))
       (when (and (or (not ctl)
                     (equal (car ctl) "text/plain"))
                 (not format)) ;; article with format will decode later.