(rmail-get-inbox-list): New function.

(rmail-get-new-mail): Use it.

diff --git a/lisp/mail/ChangeLog b/lisp/mail/ChangeLog
index 7d8e4b4cac5581fe2e02d72419f04485edc46307..53c1ad2d529a317f64c832fd76e443110683bec9 100644 (file)
--- a/lisp/mail/ChangeLog
+++ b/lisp/mail/ChangeLog
@@ -1,12 +1,13 @@
 2006-01-18  Henrik Enberg  <enberg@printf.se>
 
-       * rmailsum.el (rmail-summary-get-new-mail): Only call
-       `rmail-summary-goto-msg' if no new mail was found.
-
-       * rmail.el (rmail-get-new-mail): Only call `rmail-show-message'
+       * rmail.el (rmail-get-inbox-list): New function.
+       (rmail-get-new-mail): Use it.  Only call `rmail-show-message'
        on file-error condition if no new messages are found.
        (rmail): Only call `rmail-show-message' if no new mail
        was found.
+
+       * rmailsum.el (rmail-summary-get-new-mail): Only call
+       `rmail-summary-goto-msg' if no new mail was found.
        
 2006-01-18  Alex Schroeder  <alex@gnu.org>
 

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 4b1f20bfd004f322f9b3bb68a124bc3c1f5fe4bb..0f1b7d972b003f78d41f47d51c8049503120bf68 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1397,6 +1397,17 @@ original copy."
 \f
 ;;;; *** Rmail input ***
 
+(defun rmail-get-inbox-list ()
+  ;; Pull files off rmail-inbox-list onto files as long as there is no
+  ;; name conflict.  A conflict happens when two inbox file names have
+  ;; the same last component.
+  (let (list last-names)
+    (dolist (file rmail-inbox-list)
+      (unless (member (file-name-nondirectory file) last-names)
+       (push file list))
+      (push (file-name-nondirectory file) last-names))
+    (nreverse list)))
+
 ;; RLK feature not added in this version:
 ;; argument specifies inbox file or files in various ways.
 
@@ -1431,98 +1442,79 @@ It returns t if it got any new messages."
   ;; Get rid of all undo records for this buffer.
   (unless (eq buffer-undo-list t)
     (setq buffer-undo-list nil))
-  (let ((all-files (if file-name (list file-name)
-                    rmail-inbox-list))
+  (let ((files (if file-name (list file-name) (rmail-get-inbox-list)))
        (rmail-enable-multibyte (default-value 'enable-multibyte-characters))
        found current-message)
     (condition-case nil
        (progn
-         (while all-files
-           (let ((opoint (point))
-                 (new-messages 0)
-                 (delete-files ())
-                 ;; If buffer has not changed yet, and has not been saved yet,
-                 ;; don't replace the old backup file now.
-                 (make-backup-files (and make-backup-files (buffer-modified-p)))
-                 (buffer-read-only nil)
-                 ;; Don't make undo records for what we do in getting mail.
-                 (buffer-undo-list t)
-                 ;; Files to insert this time around.
-                 files
-                 ;; Last names of those files.
-                 file-last-names)
-             ;; Pull files off all-files onto files as long as there is
-             ;; no name conflict.  A conflict happens when two inbox
-             ;; file names have the same last component.
-             (while (and all-files
-                         (not (member (file-name-nondirectory (car all-files))
-                                      file-last-names)))
-               (setq files (cons (car all-files) files)
-                     file-last-names
-                     (cons (file-name-nondirectory (car all-files)) files))
-               (setq all-files (cdr all-files)))
-             ;; Put them back in their original order.
-             (setq files (nreverse files))
-
-             (save-excursion
-               (save-restriction
-                  (goto-char (point-max))
-                 (narrow-to-region (point) (point))
-                 ;; Read in the contents of the inbox files, renaming
-                 ;; them as necessary, and adding to the list of files
-                 ;; to delete eventually.
-                 (if file-name
-                     (rmail-insert-inbox-text files nil)
-                   (setq delete-files (rmail-insert-inbox-text files t)))
-                 (unless (equal (point-min) (point-max))
-                   (setq new-messages (rmail-process-new-messages)
-                          rmail-current-message (1+ rmail-total-messages)
-                          rmail-total-messages (rmail-desc-get-count))
-                   (run-hooks 'rmail-get-new-mail-hook)
-                   (save-buffer))
-                 ;; Delete the old files, now that the RMAIL file is
-                 ;; saved.
-                 (dolist (i delete-files)
-                   (condition-case nil
-                       ;; First, try deleting.
-                       (condition-case nil
-                           (delete-file i)
-                         ;; If we can't delete it, truncate it.
-                         (file-error (write-region (point) (point) i)))
-                     (file-error nil)))))
-             (if (= new-messages 0)
-                 (progn (goto-char opoint)
-                        (when (or file-name rmail-inbox-list)
-                          (message "(No new mail has arrived)")))
-               ;; Make the first unseen message the current message
-               ;; and update the summary buffer, if one exists.
-               (setq current-message (rmail-first-unseen-message))
-               (if (rmail-summary-exists)
-                   (with-current-buffer rmail-summary-buffer
-                      (rmail-update-summary)))
-                ;; Process the new messages for spam using the
-                ;; integrated spam filter.  The spam filter can mark
-                ;; messages for deletion and can output a message.
-                (if rmail-use-spam-filter
-                    ;; Loop through the new messages processing each
-                    ;; message for spam.
-                    (while (<= current-message rmail-total-messages)
-                      (rmail-spam-filter current-message)
-                      (setq current-message (1+ current-message))))
-
-                ;; Position the mail cursor again.
-               (setq current-message (rmail-first-unseen-message))
-               (if (rmail-summary-exists)
-                   (with-current-buffer rmail-summary-buffer
-                      (rmail-update-summary)
-                      (rmail-summary-goto-msg current-message))
-                  (rmail-show-message current-message))
-
-                ;; Run the after get new mail hook.
-               (run-hooks 'rmail-after-get-new-mail-hook)
-               (message "%d new message%s read"
-                        new-messages (if (= 1 new-messages) "" "s"))
-               (setq found t))))
+         (let ((opoint (point))
+               (new-messages 0)
+               (delete-files ())
+               ;; If buffer has not changed yet, and has not been saved yet,
+               ;; don't replace the old backup file now.
+               (make-backup-files (and make-backup-files (buffer-modified-p)))
+               (buffer-read-only nil)
+               ;; Don't make undo records for what we do in getting mail.
+               (buffer-undo-list t))
+           (save-excursion
+             (save-restriction
+               (goto-char (point-max))
+               (narrow-to-region (point) (point))
+               ;; Read in the contents of the inbox files, renaming
+               ;; them as necessary, and adding to the list of files
+               ;; to delete eventually.
+               (if file-name
+                   (rmail-insert-inbox-text files nil)
+                 (setq delete-files (rmail-insert-inbox-text files t)))
+               (unless (equal (point-min) (point-max))
+                 (setq new-messages (rmail-process-new-messages)
+                       rmail-current-message (1+ rmail-total-messages)
+                       rmail-total-messages (rmail-desc-get-count))
+                 (run-hooks 'rmail-get-new-mail-hook)
+                 (save-buffer))
+               ;; Delete the old files, now that the RMAIL file is
+               ;; saved.
+               (dolist (i delete-files)
+                 (condition-case nil
+                     ;; First, try deleting.
+                     (condition-case nil
+                         (delete-file i)
+                       ;; If we can't delete it, truncate it.
+                       (file-error (write-region (point) (point) i)))
+                   (file-error nil)))))
+           (if (= new-messages 0)
+               (progn (goto-char opoint)
+                      (when (or file-name rmail-inbox-list)
+                        (message "(No new mail has arrived)")))
+             ;; Make the first unseen message the current message
+             ;; and update the summary buffer, if one exists.
+             (setq current-message (rmail-first-unseen-message))
+             (if (rmail-summary-exists)
+                 (with-current-buffer rmail-summary-buffer
+                   (rmail-update-summary)))
+             ;; Process the new messages for spam using the
+             ;; integrated spam filter.  The spam filter can mark
+             ;; messages for deletion and can output a message.
+             (if rmail-use-spam-filter
+                 ;; Loop through the new messages processing each
+                 ;; message for spam.
+                 (while (<= current-message rmail-total-messages)
+                   (rmail-spam-filter current-message)
+                   (setq current-message (1+ current-message))))
+
+             ;; Position the mail cursor again.
+             (setq current-message (rmail-first-unseen-message))
+             (if (rmail-summary-exists)
+                 (with-current-buffer rmail-summary-buffer
+                   (rmail-update-summary)
+                   (rmail-summary-goto-msg current-message))
+               (rmail-show-message current-message))
+
+             ;; Run the after get new mail hook.
+             (run-hooks 'rmail-after-get-new-mail-hook)
+             (message "%d new message%s read"
+                      new-messages (if (= 1 new-messages) "" "s"))
+             (setq found t)))
          found)
       ;; Don't leave the buffer screwed up if we get a disk-full error.
       (file-error (or found (rmail-show-message))))))