Re: [rmail-mbox-branch]: inital problems

[Richard Stallman]

Thanks for fixing some bugs.

Can someone please install this patch?


Index: rmail.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.368.2.5
diff -u -r1.368.2.5 rmail.el
--- rmail.el    23 Feb 2003 00:33:25 -0000      1.368.2.5
+++ rmail.el    26 Nov 2003 22:21:37 -0000
@@ -49,6 +49,7 @@

 (eval-and-compile
   (require 'browse-url)
+  (require 'mail-utils)
   (require 'rmaildesc)
   (require 'rmailhdr))

@@ -172,7 +173,6 @@
          "\\|^x-attribution:\\|^x-disclaimer:\\|^x-trace:"
          "\\|^x-complaints-to:\\|^nntp-posting-date:\\|^user-agent:"
          "\\|^x-importance:\\|^envelope-to:\\|^delivery-date:"
-         "\\|^x-importance:\\|^envelope-to:\\|^delivery-date:"
           "\\|^x-*-priority:\\|x-mimeole:"
          "\\|^x-babyl-v6-attributes:\\|x-babyl-v6-keywords:")
   "*Regexp to match header fields that Rmail should normally hide.
@@ -645,6 +646,7 @@
 If `rmail-display-summary' is non-nil, make a summary for this RMAIL file."
   (interactive (if current-prefix-arg
                   (list (read-file-name "Run rmail on RMAIL file: "))))
+  (require 'rmail-spam-filter)
   (rmail-require-mime-maybe)
   (let* ((file-name (expand-file-name (or file-name-arg rmail-file-name)))
         ;; Use find-buffer-visiting, not get-file-buffer, for those users
@@ -2126,13 +2128,14 @@
         (setq keyword-list (rmail-desc-get-keywords rmail-current-message)))

     ;; Generate the result string.
-    (setq result (mapconcat '(lambda (arg) arg) keyword-list " "))
+    (setq result (mapconcat '(lambda (arg) arg) keyword-list ", "))

     ;; Update the mode line to display the keywords, the current
     ;; message index and the total number of messages.
     (setq mode-line-process
-         (format " %d/%d %s"
-                 rmail-current-message rmail-total-messages result))
+         (concat (format " %d/%d" rmail-current-message rmail-total-messages)
+                 (unless (string-equal result "")
+                   (concat "; " result))))

     ;; If rmail-enable-mime is non-nil, we may have to update
     ;; `mode-line-process' of rmail-view-buffer too.
@@ -2458,7 +2461,7 @@
       ;; out of the Rmail file so as not to break other mail agents.
       (progn
         (message "No messages to show.  Add something better soon.")
-        (rmail-display-labels)
+        (setq mode-line-process " no messages")
         (force-mode-line-update))

     ;; There are messages.  Show one.
Index: rmailsum.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mail/rmailsum.el,v
retrieving revision 1.127.2.2
diff -u -r1.127.2.2 rmailsum.el
--- rmailsum.el 18 Feb 2003 16:47:23 -0000      1.127.2.2
+++ rmailsum.el 26 Nov 2003 22:21:38 -0000
@@ -1081,7 +1081,8 @@
       (if (< n 1)
          (progn (message "No preceding message")
                 (setq n 1)))
-      (if (> n total)
+      (if (and (> n total)
+              (> total 0))
          (progn (message "No following message")
                 (goto-char (point-max))
                 (rmail-summary-goto-msg nil nowarn skip-rmail)))