Change to citation regexp for rmail-font-lock-keywords.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 49128f85eb50c66041577354fb755a3c17fc68cf..bdd0256768ede98cda5d61249f5248f7e6b25a97 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -151,12 +151,19 @@ Called with region narrowed to the message, including headers.")
 (defvar rmail-overlay-list nil)
 
 (defvar rmail-font-lock-keywords
-  '(("^\\(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)
-    ("^[ \t]*\\sw*[>|}].*$" . font-lock-reference-face)                ; Citation.
-    ("^\\(X-[A-Za-z0-9-]+\\|In-reply-to\\|Date\\):.*$" . font-lock-string-face))
+  (eval-when-compile
+    (let* ((cite-prefix "A-Za-z") (cite-suffix (concat cite-prefix "0-9_.@-")))
+      (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)
+       (cons (concat "^[ \t]*"
+                    "\\([" cite-prefix "]+[" cite-suffix "]*\\)?"
+                    "[>|}].*")
+            'font-lock-reference-face)
+       '("^\\(X-[A-Za-z0-9-]+\\|In-reply-to\\|Date\\):.*$"
+        . font-lock-string-face))))
   "Additional expressions to highlight in Rmail mode.")
 
 ;; These are used by autoloaded rmail-summary.