From f3592e412ea3e7b9724d04047d0aad86188cf82e Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 11 Apr 2006 07:44:35 +0000 Subject: [PATCH] Synch to No Gnus 200604110726. --- lisp/ChangeLog | 3 +++ lisp/rfc2047.el | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2769c41..73a0150 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2006-04-11 Lars Magne Ingebrigtsen + * rfc2047.el (rfc2047-decode-encoded-words): Don't message about + unknown charset. + * message.el (message-header-synonyms): Add Original-To to the default. diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el index 419dfd4..b0d2bdc 100644 --- a/lisp/rfc2047.el +++ b/lisp/rfc2047.el @@ -822,11 +822,8 @@ ENCODED-WORD)." (let (word charset cs encoding text rest) (while words (setq word (pop words)) - (if (and (or (setq cs (rfc2047-charset-to-coding-system - (setq charset (car word)))) - (progn - (message "Unknown charset: %s" charset) - nil)) + (if (and (setq cs (rfc2047-charset-to-coding-system + (setq charset (car word)))) (condition-case code (cond ((char-equal ?B (nth 1 word)) (setq text (base64-decode-string -- 1.7.10.4