From: yamaoka <yamaoka>
Date: Mon, 12 Dec 2005 01:54:57 +0000 (+0000)
Subject: Synch to No Gnus 200512120154.
X-Git-Tag: t-gnus-6_17_4-quimby-~182
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f364f80c0429d2cd8d0cafb70692773dbeeb4452;p=elisp%2Fgnus.git-

Synch to No Gnus 200512120154.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2bfe25c..3023306 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* rfc2047.el (rfc2047-charset-to-coding-system): Recognize
+	us-ascii as a MIME charset.
+
 	* mm-bodies.el (mm-decode-content-transfer-encoding): Protect
 	against the case where the 2nd arg TYPE is nil.
 
diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index f5631f4..130af04 100644
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -802,11 +802,11 @@ If your Emacs implementation can't decode CHARSET, return nil."
 	    (memq 'gnus-all mail-parse-ignored-charsets)
 	    (memq charset mail-parse-ignored-charsets))
     (setq charset mail-parse-charset))
-  (let ((cs (mm-coding-system-p (mm-charset-to-coding-system charset))))
+  (let ((cs (mm-charset-to-coding-system charset)))
     (cond ((eq cs 'ascii)
 	   (setq cs (or (mm-charset-to-coding-system mail-parse-charset)
 			'raw-text)))
-	  (cs)
+	  ((mm-coding-system-p cs))
 	  ((and charset
 		(listp mail-parse-ignored-charsets)
 		(memq 'gnus-unknown mail-parse-ignored-charsets))