(rmail-summary-font-lock-keywords): Make sure the

regexp for labels cannot span several lines.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 44ec52f08b364c60b70033a825dcb624d92a2b46..cd3088f523d1dc5de8da38e9bc62d89a94603e38 100644 (file)
--- 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 38688190c56eda72ae226ce326054853533f243a..b1387633dbe01aab55e563cf4d5dfbb15bc28988 100644 (file)
--- 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.