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

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

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index 77297d8b910..8aae7dff5e4 100644
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -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 --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index cfdefe8d3d3..b75c04f13ff 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -1082,7 +1082,7 @@ If SKIP-RMAIL, don't do anything to the Rmail buffer."
 	       (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 @@ KEYWORDS is a comma-separated list of labels."
   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 @@ 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 "%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) "-"