(rmail-make-summary-line-1): Change comma after last label to a space.

(rmail-summary-font-lock-keywords): Adapt to that change.

1 files changed, 7 insertions, 3 deletions

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)