(message-hide-header-p): Change logic.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b27306..d3928dc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
        * message.el (message-hidden-headers): New variable.
        (message-hide-headers): New function.
        (message-hide-header-p): New function.
+       (message-hide-header-p): Change logic.
 
        * lpath.el (featurep): Bind Info-directory, Info-menu.
 

diff --git a/lisp/message.el b/lisp/message.el
index eeba47e..9201bc8 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -984,8 +984,8 @@ candidates:
 
 (defcustom message-hidden-headers nil
   "Regexp of headers to be hidden when composing new messages.
-This can also be a list of regexps to match headers.  Or, instead of
-regexps, the elements can be on the form `(not REGEXP)'."
+This can also be a list of regexps to match headers.  Or a list
+starting with `not' and followed by regexps.."
   :group 'message
   :type '(repeat regexp))
 
@@ -6493,18 +6493,17 @@ regexp varstr."
                                              message-hidden t))))))))
 
 (defun message-hide-header-p (regexps)
-  (let ((result nil))
+  (let ((result nil)
+       (reverse nil))
+    (when (eq (car regexps) 'not)
+      (setq reverse t)
+      (pop regexps))
     (dolist (regexp regexps)
       (setq result
            (or result
-               (cond
-                ((stringp regexp)
-                 (looking-at regexp))
-                ((and (consp regexp)
-                      (eq (car regexp) 'not))
-                 (not (looking-at (cadr regexp))))
-                (t
-                 (error "Invalid header match: %s" regexp))))))
+               (if reverse
+                   (not (looking-at regexp))
+                 (looking-at regexp)))))
     result))
 
 (when (featurep 'xemacs)