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

diff -r 408bd18a297c -r 052f90cd157d lisp/mail/ChangeLog
--- a/lisp/mail/ChangeLog	Mon Jan 16 01:35:11 2006 +0000
+++ b/lisp/mail/ChangeLog	Mon Jan 16 03:57:31 2006 +0000
@@ -1,5 +1,11 @@
 2006-01-16  Henrik Enberg  <enberg@printf.se>
 
+	* rmail.el: Don't require `rmailout' and `rmailsum'.
+
+	* 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.el (rmail-url-map, rmail-activate-urls, rmail-visit-url-at-mouse,
 	rmail-visit-url-at-point, rmail-browse-body): Deleted, don't
 	duplicate goto-address functionality.
diff -r 408bd18a297c -r 052f90cd157d lisp/mail/rmailsum.el
--- a/lisp/mail/rmailsum.el	Mon Jan 16 01:35:11 2006 +0000
+++ b/lisp/mail/rmailsum.el	Mon Jan 16 03:57:31 2006 +0000
@@ -1082,7 +1082,7 @@
 	       (goto-char (point-max))
 	       (rmail-summary-goto-msg nil nowarn skip-rmail)))
     (goto-char (point-min))
-    (if (not (re-search-forward (format "^%4d[^0-9]" n) nil t))
+    (if (not (re-search-forward (format "^%5d[^0-9]" n) nil t))
 	(progn (or nowarn (message "Message %d not found" n))
 	       (setq n curmsg)
 	       (setq message-not-found t)
@@ -1670,7 +1670,12 @@
   summary buffer if the User has enabled line counts, otherwise return
   an empty string."
   (if rmail-summary-line-count-flag
-      (format "[%s]" (rmail-desc-get-line-count n))
+      (let ((lines (rmail-desc-get-line-count n)))
+	(format (cond ((<= lines     9) "   [%d]")
+		      ((<= lines    99) "  [%d]")
+		      ((<= lines   999) " [%3d]")
+		      (t "[%d]"))
+		lines))
     ""))
 
 (defun rmail-summary-get-summary-attributes (n)
@@ -1689,7 +1694,7 @@
 (defun rmail-summary-get-summary (n)
   "Return a summary line for message N."
   (funcall rmail-summary-line-decoder
-	   (format "%4s%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) "-"