Handle empty regexp in `rmail-nonignored-headers'

Handle empty regexp in `rmail-nonignored-headers'

[Bastien Guerry]

The default value for `rmail-nonignored-headers' is "^x-spam-status:".
If the user wants to remove this header from the list of non-ignored
headers, she will set `rmail-nonignored-headers' to the empty string.
This will end up in *not* ignoring any header, which is wrong.

This simple patch fixed this -- can I commit it?

--- rmail.el.~1.447.~	2008-02-06 23:54:33.000000000 +0000
+++ rmail.el	2008-02-10 16:30:56.000000000 +0000
@@ -2329,7 +2329,8 @@
 	  (while (and ignored-headers
 		      (re-search-forward ignored-headers nil t))
 	    (beginning-of-line)
-	    (if (looking-at rmail-nonignored-headers)
+	    (if (and (not (equal rmail-nonignored-headers ""))
+		     (looking-at rmail-nonignored-headers))
 		(forward-line 1)
 	      (delete-region (point)
 			     (save-excursion

-- 
Bastien

Re: Handle empty regexp in `rmail-nonignored-headers'

[Stefan Monnier]

> The default value for `rmail-nonignored-headers' is "^x-spam-status:".
> If the user wants to remove this header from the list of non-ignored
> headers, she will set `rmail-nonignored-headers' to the empty string.
> This will end up in *not* ignoring any header, which is wrong.

> This simple patch fixed this -- can I commit it?

I'd rather allow rmail-nonignored-headers to be nil (to mean "don't
unignore any headers") and let "" have its standard meaning of "match
everything/everywhere".


        Stefan


> --- rmail.el.~1.447.~	2008-02-06 23:54:33.000000000 +0000
> +++ rmail.el	2008-02-10 16:30:56.000000000 +0000
> @@ -2329,7 +2329,8 @@
>  	  (while (and ignored-headers
>  		      (re-search-forward ignored-headers nil t))
>  	    (beginning-of-line)
> -	    (if (looking-at rmail-nonignored-headers)
> +	    (if (and (not (equal rmail-nonignored-headers ""))
> +		     (looking-at rmail-nonignored-headers))
>  		(forward-line 1)
>  	      (delete-region (point)
>  			     (save-excursion

> -- 
> Bastien

Re: Handle empty regexp in `rmail-nonignored-headers'

[Eli Zaretskii]

> From: Bastien Guerry <bzg@altern.org>
> Date: Sun, 10 Feb 2008 16:37:18 +0000
> 
> +	    (if (and (not (equal rmail-nonignored-headers ""))

How about string= instead?

> This simple patch fixed this -- can I commit it?

Yes, please.

Thanks.

Re: Handle empty regexp in `rmail-nonignored-headers'

[Bastien]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> The default value for `rmail-nonignored-headers' is "^x-spam-status:".
>> If the user wants to remove this header from the list of non-ignored
>> headers, she will set `rmail-nonignored-headers' to the empty string.
>> This will end up in *not* ignoring any header, which is wrong.
>
>> This simple patch fixed this -- can I commit it?
>
> I'd rather allow rmail-nonignored-headers to be nil (to mean "don't
> unignore any headers") and let "" have its standard meaning of "match
> everything/everywhere".

Yes, I have followed this path.

-- 
Bastien

Re: Handle empty regexp in `rmail-nonignored-headers'

[Richard Stallman]

    This simple patch fixed this -- can I commit it?

The patch looks correct.

Re: Handle empty regexp in `rmail-nonignored-headers'

[Bastien]

[-- Attachment #1: Type: text/plain, Size: 183 bytes --]

Richard Stallman <rms@gnu.org> writes:

>     This simple patch fixed this -- can I commit it?
>
> The patch looks correct.

Following Stefan's advice, I applied this patch instead:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: rmail.el.patch --]
[-- Type: text/x-diff, Size: 1362 bytes --]

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

[-- Attachment #3: Type: text/plain, Size: 13 bytes --]


-- 
Bastien