# HG changeset patch
# User Henrik Enberg <henrik.enberg@telia.com>
# Date 1137384697 0
# Node ID a271a865e911d9d33bc97c040804344f40ce2f21
# Parent  052f90cd157d1fb76ca1aaae2b014b797d99666c
*** empty log message ***

diff -r 052f90cd157d -r a271a865e911 lisp/mail/ChangeLog
--- a/lisp/mail/ChangeLog	Mon Jan 16 03:57:31 2006 +0000
+++ b/lisp/mail/ChangeLog	Mon Jan 16 04:11:37 2006 +0000
@@ -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 -r 052f90cd157d -r a271a865e911 lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Mon Jan 16 03:57:31 2006 +0000
+++ b/lisp/mail/rmail.el	Mon Jan 16 04:11:37 2006 +0000
@@ -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 -r 052f90cd157d -r a271a865e911 lisp/mail/rmailsum.el
--- a/lisp/mail/rmailsum.el	Mon Jan 16 03:57:31 2006 +0000
+++ b/lisp/mail/rmailsum.el	Mon Jan 16 04:11:37 2006 +0000
@@ -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 @@
 (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) "-"