procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
(rmail-clear-headers): Don't check `rmail-nonignored-headers' when
it is nil.
This commit is contained in:
Bastien Guerry 2008-02-10 22:10:09 +00:00
parent 78df961d59
commit be16d955c8
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
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>
* epg-config.el: Expand the contents of epg-package-info.el.

6
lisp/mail/rmail.el
View file

@ -299,6 +299,7 @@ go to that message and type \\[rmail-toggle-header] twice."
"*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 @@ when you view the message for the first time in Rmail.
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 @@ unless they also match `rmail-nonignored-headers'."
(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