From f58faced4e6b5db0c558a8806a7dfa80dc5222c9 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 17 Feb 2009 02:37:40 +0000 Subject: [PATCH] (rmail-get-attr-names): Give a warning rather than an error if the header is corrupt. --- lisp/ChangeLog | 10 ++++++++++ lisp/mail/rmail.el | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 093bd0fa8e1..735e91e99e3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2009-02-17 Glenn Morris + + * mail/rmailout.el (rmail-fields-not-to-output): Doc fix. + (rmail-delete-unwanted-fields): Ignore case. Use line-beg-pos. + (rmail-output, rmail-output-as-seen): Change the "from-gnus" argument to + "not-rmail", and make it work. Simplify. + + * mail/rmail.el (rmail-get-attr-names): Give a warning rather than an + error if the header is corrupt. + 2009-02-16 Ulf Jasper * net/newst-treeview.el (newsticker--treeview-load): Offer diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 9ba9accd0d3..50ea344785f 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -2054,16 +2054,16 @@ If MSG is nil, use the current message." (nmax (length rmail-attr-array)) result temp) (when value - (unless (= (length value) nmax) - (error "Corrupt attribute header in message")) - (dotimes (index nmax) - (setq temp (and (not (= ?- (aref value index))) - (nth 1 (aref rmail-attr-array index))) - result - (cond - ((and temp result) (format "%s, %s" result temp)) - (temp temp) - (t result)))) + (if (/= (length value) nmax) + (message "Warning: corrupt attribute header in message") + (dotimes (index nmax) + (setq temp (and (not (= ?- (aref value index))) + (nth 1 (aref rmail-attr-array index))) + result + (cond + ((and temp result) (format "%s, %s" result temp)) + (temp temp) + (t result))))) result))) (defun rmail-get-keywords (&optional msg) -- 2.39.5