From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 17 Mar 2000 20:05:14 +0000 (+0000)
Subject: (rmail-summary-font-lock-keywords): Make sure the
X-Git-Tag: emacs-pretest-21.0.90~4613
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=af5954448519a70407567eb18ff780428b691f95;p=emacs.git

(rmail-summary-font-lock-keywords): Make sure the
regexp for labels cannot span several lines.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 44ec52f08b3..cd3088f523d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,10 @@
 2000-03-17  Stefan Monnier  <monnier@cs.yale.edu>
 
-	* emacs-lisp/cl-macs.el (cl-do-arglist): Don't add (setq :<key> ':<key>).
+	* mail/rmailsum.el (rmail-summary-font-lock-keywords): Make sure the
+	regexp for labels cannot span several lines.
+
+	* emacs-lisp/cl-macs.el (cl-do-arglist): Don't add useless
+	(setq :<key> ':<key>) to the macro expansion.
 
 2000-03-16  Dave Love  <fx@gnu.org>
 
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 38688190c56..b1387633dbe 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -50,7 +50,7 @@
     ("^....-.*" . font-lock-type-face)				; Unread.
     ;; Neither of the below will be highlighted if either of the above are:
     ("^....[^D-] \\(......\\)" 1 font-lock-keyword-face)	; Date.
-    ("{ \\([^}]+\\),}" 1 font-lock-comment-face))		; Labels.
+    ("{ \\([^\n}]+\\),}" 1 font-lock-comment-face))		; Labels.
   "Additional expressions to highlight in Rmail Summary mode.")
 
 ;; Entry points for making a summary buffer.