Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65bc8b6..87b5cdb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-26  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * message.el (message-font-lock-keywords): Revert 2002-06-22
+       change.
+

 2002-06-24  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * message.el (message-font-lock-keywords): Put colon in header
 2002-06-24  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * message.el (message-font-lock-keywords): Put colon in header

diff --git a/lisp/message.el b/lisp/message.el
index 2528999..d5b304c 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1170,27 +1170,26 @@ candidates:
 (defvar message-font-lock-keywords
   (let ((content "[ \t]*\\(.+\\(\n[ \t].*\\)*\\)\n?"))
     `((,(concat "^\\([Tt]o:\\)" content)
 (defvar message-font-lock-keywords
   (let ((content "[ \t]*\\(.+\\(\n[ \t].*\\)*\\)\n?"))
     `((,(concat "^\\([Tt]o:\\)" content)

-       (1 (if (message-point-in-header-p) 'message-header-name-face))
-       (2 (if (message-point-in-header-p) 'message-header-to-face) nil t))
+       (1 'message-header-name-face)
+       (2 'message-header-to-face nil t))

       (,(concat "^\\([GBF]?[Cc][Cc]:\\|[Rr]eply-[Tt]o:\\|"
                "[Mm]ail-[Cc]opies-[Tt]o:\\|"
                "[Mm]ail-[Rr]eply-[Tt]o:\\|"
                "[Mm]ail-[Ff]ollowup-[Tt]o:\\)" content)
       (,(concat "^\\([GBF]?[Cc][Cc]:\\|[Rr]eply-[Tt]o:\\|"
                "[Mm]ail-[Cc]opies-[Tt]o:\\|"
                "[Mm]ail-[Rr]eply-[Tt]o:\\|"
                "[Mm]ail-[Ff]ollowup-[Tt]o:\\)" content)

-       (1 (if (message-point-in-header-p) 'message-header-name-face))
-       (2 (if (message-point-in-header-p) 'message-header-cc-face) nil t))
+       (1 'message-header-name-face)
+       (2 'message-header-cc-face nil t))

       (,(concat "^\\([Ss]ubject:\\)" content)
       (,(concat "^\\([Ss]ubject:\\)" content)

-       (1 (if (message-point-in-header-p) 'message-header-name-face))
-       (2 (if (message-point-in-header-p) 'message-header-subject-face) nil t))
+       (1 'message-header-name-face)
+       (2 'message-header-subject-face nil t))

       (,(concat "^\\([Nn]ewsgroups:\\|Followup-[Tt]o:\\)" content)
       (,(concat "^\\([Nn]ewsgroups:\\|Followup-[Tt]o:\\)" content)

-       (1 (if (message-point-in-header-p) 'message-header-name-face))
-       (2 (if (message-point-in-header-p) 'message-header-newsgroups-face)
-         nil t))
+       (1 'message-header-name-face)
+       (2 'message-header-newsgroups-face nil t))

       (,(concat "^\\([A-Z][^: \n\t]+:\\)" content)
       (,(concat "^\\([A-Z][^: \n\t]+:\\)" content)

-       (1 (if (message-point-in-header-p) 'message-header-name-face))
-       (2 (if (message-point-in-header-p) 'message-header-other-face) nil t))
-      (,(concat "^\\(X-[A-Za-z0-9-]+\\|In-Reply-To\\):" content)
-       (1 (if (message-point-in-header-p) 'message-header-name-face))
-       (2 (if (message-point-in-header-p) 'message-header-name-face)))
+       (1 'message-header-name-face)
+       (2 'message-header-other-face nil t))
+      (,(concat "^\\(X-[A-Za-z0-9-]+:\\|In-Reply-To:\\)" content)
+       (1 'message-header-name-face)
+       (2 'message-header-name-face))

       ,@(if (and mail-header-separator
                 (not (equal mail-header-separator "")))
            `((,(concat "^\\(" (regexp-quote mail-header-separator) "\\)$")
       ,@(if (and mail-header-separator
                 (not (equal mail-header-separator "")))
            `((,(concat "^\\(" (regexp-quote mail-header-separator) "\\)$")