From: Henrik Enberg <henrik.enberg@telia.com>
Date: Mon, 16 Jan 2006 04:11:37 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=11928be7e24b30f9273b98dcc5988e2494a3675b;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index 8aae7dff5e4..be5652e492e 100644
--- 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 51b021d343b..15a85c3d2c3 100644
--- 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 b75c04f13ff..cf3b1ad3a91 100644
--- 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) "-"