Tweak font-lock-keywords

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 70308097d9c4946a6918ce6ea100a469101065f3..8eb37907f4c24713991a17382f20bf3d3275a19c 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -188,14 +188,17 @@ before obeying `rmail-ignored-headers'.")
       (list '("^\\(From\\|Sender\\):" . font-lock-function-name-face)
            '("^Reply-To:.*$" . font-lock-function-name-face)
            '("^Subject:" . font-lock-comment-face)
-           '("^\\(To\\|Apparently-To\\|Cc\\):" . font-lock-keyword-face)
+           '("^\\(To\\|Apparently-To\\|Cc\\|Newsgroups\\):"
+             . font-lock-keyword-face)
            ;; Use MATCH-ANCHORED to effectively anchor the regexp left side.
            `(,cite-chars
              (,(concat "\\=[ \t]*"
-                       "\\([" cite-prefix "]+[" cite-suffix "]*\\)?"
-                       cite-chars ".*")
+                       "\\(\\([" cite-prefix "]+[" cite-suffix "]*\\)?"
+                       "\\(" cite-chars "[ \t]*\\)\\)+"
+                       "\\(.*\\)")
               (beginning-of-line) (end-of-line)
-              (0 font-lock-reference-face)))       
+              (2 font-lock-reference-face nil t)
+              (4 font-lock-comment-face nil t)))
            '("^\\(X-[A-Za-z0-9-]+\\|In-reply-to\\|Date\\):.*$"
              . font-lock-string-face))))
   "Additional expressions to highlight in Rmail mode.")

diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 1ac0e958fb401cc8435710a08636a4fd29369bce..8da44d991f9745b89e06470ef9070889c311c7ad 100644 (file)
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -215,20 +215,23 @@ actually occur.")
     (let* ((cite-chars "[>|}]")
           (cite-prefix "A-Za-z")
           (cite-suffix (concat cite-prefix "0-9_.@-`'\"")))
-      (list '("^To:" . font-lock-function-name-face)
-           '("^B?CC:\\|^Reply-to:" . font-lock-keyword-face)
+      (list '("^\\(To\\|Newsgroups\\):" . font-lock-function-name-face)
+           '("^\\(B?CC\\|Reply-to\\):" . font-lock-keyword-face)
            '("^\\(Subject:\\)[ \t]*\\(.+\\)?"
              (1 font-lock-comment-face) (2 font-lock-type-face nil t))
            ;; Use EVAL to delay in case `mail-header-separator' gets changed.
-           '(eval cons (concat "^" (regexp-quote mail-header-separator) "$")
-                  'font-lock-comment-face)
+           '(eval .
+             (cons (concat "^" (regexp-quote mail-header-separator) "$")
+                   'font-lock-warning-face))
            ;; Use MATCH-ANCHORED to effectively anchor the regexp left side.
            `(,cite-chars
              (,(concat "\\=[ \t]*"
-                       "\\([" cite-prefix "]+[" cite-suffix "]*\\)?"
-                       cite-chars ".*")
+                       "\\(\\([" cite-prefix "]+[" cite-suffix "]*\\)?"
+                       "\\(" cite-chars "[ \t]*\\)\\)+"
+                       "\\(.*\\)")
               (beginning-of-line) (end-of-line)
-              (0 font-lock-reference-face)))
+              (2 font-lock-reference-face nil t)
+              (4 font-lock-comment-face nil t)))
            '("^\\(X-[A-Za-z0-9-]+\\|In-reply-to\\):.*"
              . font-lock-string-face))))
   "Additional expressions to highlight in Mail mode.")