Commit be16d955 authored by Bastien Guerry's avatar Bastien Guerry
Browse files

(rmail-nonignored-headers): Allow to be nil.

(rmail-clear-headers): Don't check `rmail-nonignored-headers' when
it is nil.
parent 78df961d
2008-02-10 Bastien Guerry <bzg@altern.org>
* mail/rmail.el (rmail-nonignored-headers): Allow to be nil.
(rmail-clear-headers): Don't check `rmail-nonignored-headers' when
it is nil.
2008-02-10 Daiki Ueno <ueno@unixuser.org> 2008-02-10 Daiki Ueno <ueno@unixuser.org>
   
* epg-config.el: Expand the contents of epg-package-info.el. * epg-config.el: Expand the contents of epg-package-info.el.
......
...@@ -299,6 +299,7 @@ go to that message and type \\[rmail-toggle-header] twice." ...@@ -299,6 +299,7 @@ go to that message and type \\[rmail-toggle-header] twice."
"*Regexp to match X header fields that Rmail should show. "*Regexp to match X header fields that Rmail should show.
This regexp overrides `rmail-ignored-headers'; if both this regexp This regexp overrides `rmail-ignored-headers'; if both this regexp
and that one match a certain header field, Rmail shows the field. 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, This variable is used for reformatting the message header,
which normally happens once for each message, which normally happens once for each message,
...@@ -306,7 +307,7 @@ when you view the message for the first time in Rmail. ...@@ -306,7 +307,7 @@ when you view the message for the first time in Rmail.
To make a change in this variable take effect To make a change in this variable take effect
for a message that you have already viewed, for a message that you have already viewed,
go to that message and type \\[rmail-toggle-header] twice." go to that message and type \\[rmail-toggle-header] twice."
:type 'regexp :type '(choice (const nil) (regexp))
:group 'rmail-headers) :group 'rmail-headers)
;;;###autoload ;;;###autoload
...@@ -2329,7 +2330,8 @@ unless they also match `rmail-nonignored-headers'." ...@@ -2329,7 +2330,8 @@ unless they also match `rmail-nonignored-headers'."
(while (and ignored-headers (while (and ignored-headers
(re-search-forward ignored-headers nil t)) (re-search-forward ignored-headers nil t))
(beginning-of-line) (beginning-of-line)
(if (looking-at rmail-nonignored-headers) (if (and rmail-nonignored-headers
(looking-at rmail-nonignored-headers))
(forward-line 1) (forward-line 1)
(delete-region (point) (delete-region (point)
(save-excursion (save-excursion
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment