diff -u /home/guerry/install/cvs/emacs/lisp/mail/rmail.el.\~1.447.\~ /home/guerry/install/cvs/emacs/lisp/mail/rmail.el --- /home/guerry/install/cvs/emacs/lisp/mail/rmail.el.~1.447.~ 2008-02-01 16:01:27.000000000 +0000 +++ /home/guerry/install/cvs/emacs/lisp/mail/rmail.el 2008-02-10 21:13:03.000000000 +0000 @@ -299,6 +299,7 @@ "*Regexp to match X header fields that Rmail should show. This regexp overrides `rmail-ignored-headers'; if both this regexp and that one match a certain header field, Rmail shows the field. +If this is nil, ignore all header fields in `rmail-ignored-headers'. This variable is used for reformatting the message header, which normally happens once for each message, @@ -306,7 +307,7 @@ To make a change in this variable take effect for a message that you have already viewed, go to that message and type \\[rmail-toggle-header] twice." - :type 'regexp + :type '(choice (const nil) (regexp)) :group 'rmail-headers) ;;;###autoload @@ -2329,7 +2330,8 @@ (while (and ignored-headers (re-search-forward ignored-headers nil t)) (beginning-of-line) - (if (looking-at rmail-nonignored-headers) + (if (and rmail-nonignored-headers + (looking-at rmail-nonignored-headers)) (forward-line 1) (delete-region (point) (save-excursion Diff finished. Mon Feb 11 01:00:01 2008