From: yamaoka <yamaoka>
Date: Mon, 20 Feb 2006 11:29:33 +0000 (+0000)
Subject: Synch to No Gnus 200602201129.
X-Git-Tag: t-gnus-6_17_4-quimby-~88
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3edbdfea0c75421c95034d7b20112e5c09405782;p=elisp%2Fgnus.git-

Synch to No Gnus 200602201129.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e7c7b23..463e5a2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* rfc2047.el (rfc2047-charset-to-coding-system): Don't check the
+	coding system which mm-charset-to-coding-system returns for a
+	given charset is valid.
+
 2006-02-16  Juanma Barranquero  <lekktu@gmail.com>
 
 	* html2text.el (html2text-remove-tag-list):
diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index ef2ff11..419dfd4 100644
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -806,7 +806,7 @@ If your Emacs implementation can't decode CHARSET, return nil."
     (cond ((eq cs 'ascii)
 	   (setq cs (or (mm-charset-to-coding-system mail-parse-charset)
 			'raw-text)))
-	  ((setq cs (mm-coding-system-p cs)))
+	  ((mm-coding-system-p cs))
 	  ((and charset
 		(listp mail-parse-ignored-charsets)
 		(memq 'gnus-unknown mail-parse-ignored-charsets))