[Emacs-diffs] Changes to emacs/lisp/mail/rmail.el,v

[Bastien Guerry]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Bastien Guerry <bastien1>       08/02/10 22:10:09

Index: mail/rmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -b -r1.447 -r1.448
--- mail/rmail.el       1 Feb 2008 16:01:27 -0000       1.447
+++ mail/rmail.el       10 Feb 2008 22:10:09 -0000      1.448
@@ -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