From: Miles Bader Date: Mon, 20 Feb 2006 21:55:04 +0000 (+0000) Subject: Revision: emacs@sv.gnu.org/emacs--devo--0--patch-106 X-Git-Tag: emacs-pretest-22.0.90~3995 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e13be7a27306b1f1c7289801e47cdb093e9b0f3e;p=emacs.git Revision: emacs@sv.gnu.org/emacs--devo--0--patch-106 Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 37) - Update from CVS --- diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 903be005174..c77c92d05c7 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2006-02-20 Katsumi Yamaoka + + * 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 * html2text.el (html2text-remove-tag-list): diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el index c5d4fc191df..c89528a30db 100644 --- a/lisp/gnus/rfc2047.el +++ b/lisp/gnus/rfc2047.el @@ -835,7 +835,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))