From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 30 Sep 2003 12:43:49 +0000 (+0000)
Subject: (rmail-make-summary-line-1): Change comma after last label to a space.
X-Git-Tag: ttn-vms-21-2-B4~8687
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8562b03a631e6fc542830f0fef0908474eca364;p=emacs.git

(rmail-make-summary-line-1): Change comma after last label to a space.
(rmail-summary-font-lock-keywords): Adapt to that change.
---

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 3affdf88bb5..cd8d7d67aa4 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -51,7 +51,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.
-    ("{ \\([^\n}]+\\),}" 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.
@@ -300,8 +300,12 @@ By default, `identity' is set."
 		 ""
 	       (concat "{"
 		       (buffer-substring (point)
-					 (progn (end-of-line) (point)))
-		       "} ")))))
+					 (progn (end-of-line)
+						(backward-char)
+						(if (looking-at ",")
+						    (point)
+						  (1+ (point)))))
+		       " } ")))))
 	 (line
 	  (progn
 	    (forward-line 1)