From: yamaoka <yamaoka>
Date: Wed, 26 May 2004 09:55:00 +0000 (+0000)
Subject: Synch to No Gnus 200405260954.
X-Git-Tag: t-gnus-6_17_4-quimby-~895
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4db83efb9026c030ee660789b2719a0420e345c;p=elisp%2Fgnus.git-

Synch to No Gnus 200405260954.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c8faff4..20ca111 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
 	* dgnushack.el: Autoload customize-set-variable for XEmacs.
 
 	* rfc2047.el (rfc2047-encodable-p): Don't move point.
+	(rfc2047-decode): Treat the ascii coding-system as raw-text.
 
 2004-05-25  Teodor Zlatanov  <tzz@lifelogs.com>
 
diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index 0f74b68..d844920 100644
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -810,9 +810,8 @@ If your Emacs implementation can't decode CHARSET, return nil."
 	     (memq 'gnus-unknown mail-parse-ignored-charsets))
 	(setq cs (mm-charset-to-coding-system mail-parse-charset)))
     (when cs
-      (when (and (eq cs 'ascii)
-		 mail-parse-charset)
-	(setq cs mail-parse-charset))
+      (when (eq cs 'ascii)
+	(setq cs (or mail-parse-charset 'raw-text)))
       (mm-decode-coding-string
        (cond
 	((char-equal ?B encoding)