Mercurial > emacs
changeset 69046:d037a8cb1b92
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 20 Feb 2006 21:55:04 +0000 |
| parents | 18cb5d3fd8be |
| children | 7e64cebb0463 |
| files | lisp/gnus/ChangeLog lisp/gnus/rfc2047.el |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Mon Feb 20 21:54:23 2006 +0000 +++ b/lisp/gnus/ChangeLog Mon Feb 20 21:55:04 2006 +0000 @@ -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):
--- a/lisp/gnus/rfc2047.el Mon Feb 20 21:54:23 2006 +0000 +++ b/lisp/gnus/rfc2047.el Mon Feb 20 21:55:04 2006 +0000 @@ -835,7 +835,7 @@ (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))