(rmail-summary-font-lock-keywords): Fix typo for

labels.
(rmail-summary-get-summary): Add labels again.

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index 642630d2911600a323447ce7a361b40640a1422c..999f34a9a35308a14718d484d20a3d9ced6e84f5 100644 (file)
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-17  Alex Schroeder  <alex@gnu.org>
+
+       * rmailsum.el (rmail-summary-font-lock-keywords): Fix typo for
+       labels.
+       (rmail-summary-get-summary): Add labels again.
+
 2006-01-16  Alex Schroeder  <alex@gnu.org>
 
        * rmail.el (rmail-nuke-pinhead-header, rmail-reformat-message)

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 1338708e7e19413083913fc680b269b990e898c1..9b0b07c0dad068ee0eb811f71b72cfb8cc4e8474 100644 (file)
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -62,7 +62,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.")
 
 (defvar rmail-summary-redo nil
@@ -1670,15 +1670,19 @@ KEYWORDS is a comma-separated list of labels."
 
 (defun rmail-summary-get-summary (n)
   "Return a summary line for message N."
-  (funcall rmail-summary-line-decoder
-          (format "%5s%s%6s %25s%s %s\n"
-                  n
-                  (rmail-summary-get-summary-attributes n)
-                  (concat (rmail-desc-get-day-number n) "-"
-                          (rmail-desc-get-month n))
-                  (rmail-desc-get-sender n)
-                  (rmail-summary-get-line-count n)
-                  (rmail-desc-get-subject n))))
+  (let* ((keywords (rmail-desc-get-keywords n))
+        (str (if keywords 
+                 (concat "{ " (mapconcat 'identity keywords " ") " } ")
+               "")))
+    (funcall rmail-summary-line-decoder
+            (format "%5s%s%6s %25s%s %s\n"
+                    n
+                    (rmail-summary-get-summary-attributes n)
+                    (concat (rmail-desc-get-day-number n) "-"
+                            (rmail-desc-get-month n))
+                    (rmail-desc-get-sender n)
+                    (rmail-summary-get-line-count n)
+                    (concat str (rmail-desc-get-subject n))))))
 
 (defun rmail-summary-update-attribute (attr-index n)
   "Update the attribute denoted by ATTR-INDEX in message N."