*** empty log message ***

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index 8aae7dff5e4da16671aafc26ffa8b3a6d148199c..be5652e492e2f072b1840b842929bfa339031020 100644 (file)
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -5,6 +5,7 @@
        * rmailsum.el (rmail-summary-get-line-count): Rightalign line count.
        (rmail-summary-get-summary): Display 5-digit message ids.
        (rmail-summary-goto-msg): Adjust for 5-digit ids.
+       (rmail-summary-font-lock-keywords): Likewise.
 
        * rmail.el (rmail-url-map, rmail-activate-urls, rmail-visit-url-at-mouse,
        rmail-visit-url-at-point, rmail-browse-body): Deleted, don't

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 51b021d343b2a7fb9a0e9390c6e9f890610f26b2..15a85c3d2c394d93252df31c4fb8d2673d6cd101 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -42,9 +42,7 @@
 (eval-when-compile
   (require 'font-lock)
   (require 'mailabbrev)
-  (require 'mule-util)                ; for detect-coding-with-priority
-  (require 'rmailout)
-  (require 'rmailsum))
+  (require 'mule-util))                ; for detect-coding-with-priority
 
 (eval-and-compile
   (require 'rmaildesc)

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index b75c04f13ffb391fce94c2086619975a6e91f101..cf3b1ad3a91e351a91d5abbe7bca8f82f9cd7b6a 100644 (file)
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -58,10 +58,10 @@
   :group 'rmail-summary)
 
 (defvar rmail-summary-font-lock-keywords
-  '(("^....D.*" . font-lock-string-face)                       ; Deleted.
+  '(("^.....D.*" . font-lock-string-face)                      ; Deleted.
     ("^....-.*" . 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.
+    ("^.....[^D-]....\\(......\\)" 1 font-lock-keyword-face)   ; Date.
     ("{ \\([^\n}]+\\),}" 1 font-lock-comment-face))            ; Labels.
   "Additional expressions to highlight in Rmail Summary mode.")
 
@@ -1694,7 +1694,7 @@ 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"
+          (format "%5s%s%6s %25s%s %s\n"
                   n
                   (rmail-summary-get-summary-attributes n)
                   (concat (rmail-desc-get-day-number n) "-"