New version.

1 files changed, 253 insertions, 230 deletions

diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el
index f8560cb3814..171463740db 100644
--- a/lisp/nnmbox.el
+++ b/lisp/nnmbox.el
@@ -1,6 +1,5 @@
 ;;; nnmbox.el --- mail mbox access for Gnus
-
-;; Copyright (C) 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; 	Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -31,19 +30,23 @@
 ;;; Code:
 
 (require 'nnheader)
-(require 'rmail)
+(require 'message)
 (require 'nnmail)
+(require 'nnoo)
+(eval-when-compile (require 'cl))
+
+(nnoo-declare nnmbox)
 
-(defvar nnmbox-mbox-file (expand-file-name "~/mbox")
+(defvoo nnmbox-mbox-file (expand-file-name "~/mbox")
   "The name of the mail box file in the user's home directory.")
 
-(defvar nnmbox-active-file (expand-file-name "~/.mbox-active")
+(defvoo nnmbox-active-file (expand-file-name "~/.mbox-active")
   "The name of the active file for the mail box.")
 
-(defvar nnmbox-get-new-mail t
+(defvoo nnmbox-get-new-mail t
   "If non-nil, nnmbox will check the incoming mail file and split the mail.")
 
-(defvar nnmbox-prepare-save-mail-hook nil
+(defvoo nnmbox-prepare-save-mail-hook nil
   "Hook run narrowed to an article before saving.")
 
 
@@ -51,191 +54,172 @@
 (defconst nnmbox-version "nnmbox 1.0"
   "nnmbox version.")
 
-(defvar nnmbox-current-group nil
+(defvoo nnmbox-current-group nil
   "Current nnmbox news group directory.")
 
 (defconst nnmbox-mbox-buffer nil)
 
-(defvar nnmbox-status-string "")
-
-(defvar nnmbox-group-alist nil)
-(defvar nnmbox-active-timestamp nil)
+(defvoo nnmbox-status-string "")
 
-
-
-(defvar nnmbox-current-server nil)
-(defvar nnmbox-server-alist nil)
-(defvar nnmbox-server-variables 
-  (list
-   (list 'nnmbox-mbox-file nnmbox-mbox-file)
-   (list 'nnmbox-active-file nnmbox-active-file)
-   (list 'nnmbox-get-new-mail nnmbox-get-new-mail)
-   '(nnmbox-current-group nil)
-   '(nnmbox-status-string "")
-   '(nnmbox-group-alist nil)))
+(defvoo nnmbox-group-alist nil)
+(defvoo nnmbox-active-timestamp nil)
 
 
 
 ;;; Interface functions
 
-(defun nnmbox-retrieve-headers (sequence &optional newsgroup server)
+(nnoo-define-basics nnmbox)
+
+(deffoo nnmbox-retrieve-headers (sequence &optional newsgroup server fetch-old)
   (save-excursion
     (set-buffer nntp-server-buffer)
     (erase-buffer)
     (let ((number (length sequence))
 	  (count 0)
 	  article art-string start stop)
-      (nnmbox-possibly-change-newsgroup newsgroup)
-      (if (stringp (car sequence))
-	  'headers
-	(while sequence
-	  (setq article (car sequence))
-	  (setq art-string (nnmbox-article-string article))
-	  (set-buffer nnmbox-mbox-buffer)
-	  (if (or (search-forward art-string nil t)
-		  (progn (goto-char (point-min))
-			 (search-forward art-string nil t)))
-	      (progn
-		(setq start 
-		      (save-excursion
-			(re-search-backward 
-			 (concat "^" rmail-unix-mail-delimiter) nil t)
-			(point)))
-		(search-forward "\n\n" nil t)
-		(setq stop (1- (point)))
-		(set-buffer nntp-server-buffer)
-		(insert (format "221 %d Article retrieved.\n" article))
-		(insert-buffer-substring nnmbox-mbox-buffer start stop)
-		(goto-char (point-max))
-		(insert ".\n")))
-	  (setq sequence (cdr sequence))
-	  (setq count (1+ count))
-	  (and (numberp nnmail-large-newsgroup)
-	       (> number nnmail-large-newsgroup)
-	       (zerop (% count 20))
-	       gnus-verbose-backends
-	       (message "nnmbox: Receiving headers... %d%%"
-			(/ (* count 100) number))))
-
+      (nnmbox-possibly-change-newsgroup newsgroup server)
+      (while sequence
+	(setq article (car sequence))
+	(setq art-string (nnmbox-article-string article))
+	(set-buffer nnmbox-mbox-buffer)
+	(if (or (search-forward art-string nil t)
+		(progn (goto-char (point-min))
+		       (search-forward art-string nil t)))
+	    (progn
+	      (setq start 
+		    (save-excursion
+		      (re-search-backward 
+		       (concat "^" message-unix-mail-delimiter) nil t)
+		      (point)))
+	      (search-forward "\n\n" nil t)
+	      (setq stop (1- (point)))
+	      (set-buffer nntp-server-buffer)
+	      (insert (format "221 %d Article retrieved.\n" article))
+	      (insert-buffer-substring nnmbox-mbox-buffer start stop)
+	      (goto-char (point-max))
+	      (insert ".\n")))
+	(setq sequence (cdr sequence))
+	(setq count (1+ count))
 	(and (numberp nnmail-large-newsgroup)
 	     (> number nnmail-large-newsgroup)
-	     gnus-verbose-backends
-	     (message "nnmbox: Receiving headers...done"))
-
-	;; Fold continuation lines.
-	(set-buffer nntp-server-buffer)
-	(goto-char (point-min))
-	(while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
-	  (replace-match " " t t))
-	'headers))))
-
-(defun nnmbox-open-server (server &optional defs)
-  (nnheader-init-server-buffer)
-  (if (equal server nnmbox-current-server)
-      t
-    (if nnmbox-current-server
-	(setq nnmbox-server-alist 
-	      (cons (list nnmbox-current-server
-			  (nnheader-save-variables nnmbox-server-variables))
-		    nnmbox-server-alist)))
-    (let ((state (assoc server nnmbox-server-alist)))
-      (if state 
-	  (progn
-	    (nnheader-restore-variables (nth 1 state))
-	    (setq nnmbox-server-alist (delq state nnmbox-server-alist)))
-	(nnheader-set-init-variables nnmbox-server-variables defs)))
-    (setq nnmbox-current-server server)))
-
-(defun nnmbox-close-server (&optional server)
+	     (zerop (% count 20))
+	     (nnheader-message 5 "nnmbox: Receiving headers... %d%%"
+			       (/ (* count 100) number))))
+
+      (and (numberp nnmail-large-newsgroup)
+	   (> number nnmail-large-newsgroup)
+	   (nnheader-message 5 "nnmbox: Receiving headers...done"))
+
+      (set-buffer nntp-server-buffer)
+      (nnheader-fold-continuation-lines)
+      'headers)))
+
+(deffoo nnmbox-open-server (server &optional defs)
+  (nnoo-change-server 'nnmbox server defs)
+  (cond 
+   ((not (file-exists-p nnmbox-mbox-file))
+    (nnmbox-close-server)
+    (nnheader-report 'nnmbox "No such file: %s" nnmbox-mbox-file))
+   ((file-directory-p nnmbox-mbox-file)
+    (nnmbox-close-server)
+    (nnheader-report 'nnmbox "Not a regular file: %s" nnmbox-mbox-file))
+   (t
+    (nnheader-report 'nnmbox "Opened server %s using mbox %s" server
+		     nnmbox-mbox-file)
+    t)))
+
+(deffoo nnmbox-close-server (&optional server)
+  (when (and nnmbox-mbox-buffer
+	     (buffer-name nnmbox-mbox-buffer))
+    (kill-buffer nnmbox-mbox-buffer))
+  (nnoo-close-server 'nnmbox server)
   t)
 
-(defun nnmbox-server-opened (&optional server)
-  (and (equal server nnmbox-current-server)
+(deffoo nnmbox-server-opened (&optional server)
+  (and (nnoo-current-server-p 'nnmbox server)
        nnmbox-mbox-buffer
        (buffer-name nnmbox-mbox-buffer)
        nntp-server-buffer
        (buffer-name nntp-server-buffer)))
 
-(defun nnmbox-status-message (&optional server)
-  nnmbox-status-string)
-
-(defun nnmbox-request-article (article &optional newsgroup server buffer)
-  (nnmbox-possibly-change-newsgroup newsgroup)
-  (if (stringp article)
-      nil
-    (save-excursion
-      (set-buffer nnmbox-mbox-buffer)
-      (goto-char (point-min))
-      (if (search-forward (nnmbox-article-string article) nil t)
-	  (let (start stop)
-	    (re-search-backward (concat "^" rmail-unix-mail-delimiter) nil t)
-	    (setq start (point))
-	    (forward-line 1)
-	    (or (and (re-search-forward 
-		      (concat "^" rmail-unix-mail-delimiter) nil t)
-		     (forward-line -1))
-		(goto-char (point-max)))
-	    (setq stop (point))
-	    (let ((nntp-server-buffer (or buffer nntp-server-buffer)))
-	      (set-buffer nntp-server-buffer)
-	      (erase-buffer)
-	      (insert-buffer-substring nnmbox-mbox-buffer start stop)
-	      (goto-char (point-min))
-	      (while (looking-at "From ")
-		(delete-char 5)
-		(insert "X-From-Line: ")
-		(forward-line 1))
-	      t))))))
-
-(defun nnmbox-request-group (group &optional server dont-check)
+(deffoo nnmbox-request-article (article &optional newsgroup server buffer)
+  (nnmbox-possibly-change-newsgroup newsgroup server)
   (save-excursion
-    (if (nnmbox-possibly-change-newsgroup group)
-	(if dont-check
-	    t
-	  (nnmbox-get-new-mail group)
-	  (save-excursion
+    (set-buffer nnmbox-mbox-buffer)
+    (goto-char (point-min))
+    (if (search-forward (nnmbox-article-string article) nil t)
+	(let (start stop)
+	  (re-search-backward (concat "^" message-unix-mail-delimiter) nil t)
+	  (setq start (point))
+	  (forward-line 1)
+	  (or (and (re-search-forward 
+		    (concat "^" message-unix-mail-delimiter) nil t)
+		   (forward-line -1))
+	      (goto-char (point-max)))
+	  (setq stop (point))
+	  (let ((nntp-server-buffer (or buffer nntp-server-buffer)))
 	    (set-buffer nntp-server-buffer)
 	    (erase-buffer)
-	    (let ((active (assoc group nnmbox-group-alist)))
-	      (insert (format "211 %d %d %d %s\n" 
-			      (1+ (- (cdr (car (cdr active)))
-				     (car (car (cdr active)))))
-			      (car (car (cdr active)))
-			      (cdr (car (cdr active)))
-			      (car active))))
-	    t)))))
-
-(defun nnmbox-close-group (group &optional server)
+	    (insert-buffer-substring nnmbox-mbox-buffer start stop)
+	    (goto-char (point-min))
+	    (while (looking-at "From ")
+	      (delete-char 5)
+	      (insert "X-From-Line: ")
+	      (forward-line 1))
+	    (if (numberp article) 
+		(cons nnmbox-current-group article)
+	      (nnmbox-article-group-number)))))))
+
+(deffoo nnmbox-request-group (group &optional server dont-check)
+  (let ((active (cadr (assoc group nnmbox-group-alist))))
+    (cond 
+     ((or (null active)
+	  (null (nnmbox-possibly-change-newsgroup group server)))
+      (nnheader-report 'nnmbox "No such group: %s" group))
+     (dont-check
+      (nnheader-report 'nnmbox "Selected group %s" group)
+      (nnheader-insert ""))
+     (t
+      (nnheader-report 'nnmbox "Selected group %s" group)
+      (nnheader-insert "211 %d %d %d %s\n" 
+		       (1+ (- (cdr active) (car active)))
+		       (car active) (cdr active) group)))))
+
+(deffoo nnmbox-request-scan (&optional group server)
+  (nnmbox-read-mbox)
+  (nnmail-get-new-mail 
+   'nnmbox 
+   (lambda ()
+     (save-excursion
+       (set-buffer nnmbox-mbox-buffer)
+       (save-buffer)))
+   nnmbox-mbox-file group
+   (lambda ()
+     (save-excursion
+       (let ((in-buf (current-buffer)))
+	 (set-buffer nnmbox-mbox-buffer)
+	 (goto-char (point-max))
+	 (insert-buffer-substring in-buf)))
+     (nnmail-save-active nnmbox-group-alist nnmbox-active-file))))
+
+(deffoo nnmbox-close-group (group &optional server)
   t)
 
-(defun nnmbox-request-list (&optional server)
-  (if server (nnmbox-get-new-mail))
+(deffoo nnmbox-request-list (&optional server)
   (save-excursion
-    (or (nnmail-find-file nnmbox-active-file)
-	(progn
-	  (setq nnmbox-group-alist (nnmail-get-active))
-	  (nnmail-save-active nnmbox-group-alist nnmbox-active-file)
-	  (nnmail-find-file nnmbox-active-file)))))
+    (nnmail-find-file nnmbox-active-file)
+    (setq nnmbox-group-alist (nnmail-get-active))))
 
-(defun nnmbox-request-newgroups (date &optional server)
+(deffoo nnmbox-request-newgroups (date &optional server)
   (nnmbox-request-list server))
 
-(defun nnmbox-request-list-newsgroups (&optional server)
-  (setq nnmbox-status-string "nnmbox: LIST NEWSGROUPS is not implemented.")
-  nil)
+(deffoo nnmbox-request-list-newsgroups (&optional server)
+  (nnheader-report 'nnmbox "LIST NEWSGROUPS is not implemented."))
 
-(defun nnmbox-request-post (&optional server)
-  (mail-send-and-exit nil))
-
-(defalias 'nnmbox-request-post-buffer 'nnmail-request-post-buffer)
-
-(defun nnmbox-request-expire-articles 
+(deffoo nnmbox-request-expire-articles 
   (articles newsgroup &optional server force)
-  (nnmbox-possibly-change-newsgroup newsgroup)
-  (let* ((days (or (and nnmail-expiry-wait-function
-			(funcall nnmail-expiry-wait-function newsgroup))
-		   nnmail-expiry-wait))
-	 (is-old t)
+  (nnmbox-possibly-change-newsgroup newsgroup server)
+  (let* ((is-old t)
 	 rest)
     (nnmail-activate 'nnmbox)
 
@@ -244,16 +228,14 @@
       (while (and articles is-old)
 	(goto-char (point-min))
 	(if (search-forward (nnmbox-article-string (car articles)) nil t)
-	    (if (or force
-		    (setq is-old
-			  (> (nnmail-days-between 
-			      (current-time-string)
-			      (buffer-substring 
-			       (point) (progn (end-of-line) (point))))
-			     days)))
+	    (if (setq is-old
+		      (nnmail-expired-article-p
+		       newsgroup
+		       (buffer-substring 
+			(point) (progn (end-of-line) (point))) force))
 		(progn
-		  (and gnus-verbose-backends
-		       (message "Deleting article %s..." (car articles)))
+		  (nnheader-message 5 "Deleting article %d in %s..."
+				    (car articles) newsgroup)
 		  (nnmbox-delete-mail))
 	      (setq rest (cons (car articles) rest))))
 	(setq articles (cdr articles)))
@@ -269,9 +251,9 @@
       (nnmail-save-active nnmbox-group-alist nnmbox-active-file)
       (nconc rest articles))))
 
-(defun nnmbox-request-move-article
+(deffoo nnmbox-request-move-article
   (article group server accept-form &optional last)
-  (nnmbox-possibly-change-newsgroup group)
+  (nnmbox-possibly-change-newsgroup group server)
   (let ((buf (get-buffer-create " *nnmbox move*"))
 	result)
     (and 
@@ -298,7 +280,9 @@
        (and last (save-buffer))))
     result))
 
-(defun nnmbox-request-accept-article (group &optional last)
+(deffoo nnmbox-request-accept-article (group &optional server last)
+  (nnmbox-possibly-change-newsgroup group server)
+  (nnmail-check-syntax)
   (let ((buf (current-buffer))
 	result)
     (goto-char (point-min))
@@ -317,13 +301,14 @@
        (setq result (nnmbox-save-mail (and (stringp group) group))))
      (save-excursion
        (set-buffer nnmbox-mbox-buffer)
+       (goto-char (point-max))
        (insert-buffer-substring buf)
        (and last (save-buffer))
        result)
      (nnmail-save-active nnmbox-group-alist nnmbox-active-file))
     (car result)))
 
-(defun nnmbox-request-replace-article (article group buffer)
+(deffoo nnmbox-request-replace-article (article group buffer)
   (nnmbox-possibly-change-newsgroup group)
   (save-excursion
     (set-buffer nnmbox-mbox-buffer)
@@ -335,6 +320,48 @@
       (save-buffer)
       t)))
 
+(deffoo nnmbox-request-delete-group (group &optional force server)
+  (nnmbox-possibly-change-newsgroup group server)
+  ;; Delete all articles in GROUP.
+  (if (not force)
+      ()				; Don't delete the articles.
+    (save-excursion
+      (set-buffer nnmbox-mbox-buffer)
+      (goto-char (point-min))
+      ;; Delete all articles in this group.
+      (let ((ident (concat "\nX-Gnus-Newsgroup: " nnmbox-current-group ":"))
+	    found)
+	(while (search-forward ident nil t)
+	  (setq found t)
+	  (nnmbox-delete-mail))
+	(and found (save-buffer)))))
+  ;; Remove the group from all structures.
+  (setq nnmbox-group-alist 
+	(delq (assoc group nnmbox-group-alist) nnmbox-group-alist)
+	nnmbox-current-group nil)
+  ;; Save the active file.
+  (nnmail-save-active nnmbox-group-alist nnmbox-active-file)
+  t)
+
+(deffoo nnmbox-request-rename-group (group new-name &optional server)
+  (nnmbox-possibly-change-newsgroup group server)
+  (save-excursion
+    (set-buffer nnmbox-mbox-buffer)
+    (goto-char (point-min))
+    (let ((ident (concat "\nX-Gnus-Newsgroup: " nnmbox-current-group ":"))
+	  (new-ident (concat "\nX-Gnus-Newsgroup: " new-name ":"))
+	  found)
+      (while (search-forward ident nil t)
+	(replace-match new-ident t t)
+	(setq found t))
+      (and found (save-buffer))))
+  (let ((entry (assoc group nnmbox-group-alist)))
+    (and entry (setcar entry new-name))
+    (setq nnmbox-current-group nil)
+    ;; Save the new group alist.
+    (nnmail-save-active nnmbox-group-alist nnmbox-active-file)
+    t))
+
 
 ;;; Internal functions.
 
@@ -352,12 +379,12 @@
     (save-restriction
       (narrow-to-region
        (save-excursion
-	 (re-search-backward (concat "^" rmail-unix-mail-delimiter) nil t)
+	 (re-search-backward (concat "^" message-unix-mail-delimiter) nil t)
 	 (if leave-delim (progn (forward-line 1) (point))
 	   (match-beginning 0)))
        (progn
 	 (forward-line 1)
-	 (or (and (re-search-forward (concat "^" rmail-unix-mail-delimiter) 
+	 (or (and (re-search-forward (concat "^" message-unix-mail-delimiter) 
 				     nil t)
 		  (if (and (not (bobp)) leave-delim)
 		      (progn (forward-line -2) (point))
@@ -368,7 +395,10 @@
       (if (or force (not (re-search-forward "^X-Gnus-Newsgroup: " nil t)))
 	  (delete-region (point-min) (point-max))))))
 
-(defun nnmbox-possibly-change-newsgroup (newsgroup)
+(defun nnmbox-possibly-change-newsgroup (newsgroup &optional server)
+  (when (and server 
+	     (not (nnmbox-server-opened server)))
+    (nnmbox-open-server server))
   (if (or (not nnmbox-mbox-buffer)
 	  (not (buffer-name nnmbox-mbox-buffer)))
       (save-excursion
@@ -380,21 +410,45 @@
       (nnmail-activate 'nnmbox))
   (if newsgroup
       (if (assoc newsgroup nnmbox-group-alist)
-	  (setq nnmbox-current-group newsgroup))))
+	  (setq nnmbox-current-group newsgroup))
+    t))
 
 (defun nnmbox-article-string (article)
-  (concat "\nX-Gnus-Newsgroup: " nnmbox-current-group ":" 
-	  (int-to-string article) " "))
+  (if (numberp article)
+      (concat "\nX-Gnus-Newsgroup: " nnmbox-current-group ":" 
+	      (int-to-string article) " ")
+    (concat "\nMessage-ID: " article)))
+
+(defun nnmbox-article-group-number ()
+  (save-excursion
+    (goto-char (point-min))
+    (and (re-search-forward "^X-Gnus-Newsgroup: +\\([^:]+\\):\\([0-9]+\\) "
+			    nil t)
+	 (cons (buffer-substring (match-beginning 1) (match-end 1))
+	       (string-to-int
+		(buffer-substring (match-beginning 2) (match-end 2)))))))
 
 (defun nnmbox-save-mail (&optional group)
   "Called narrowed to an article."
   (let* ((nnmail-split-methods 
 	  (if group (list (list group "")) nnmail-split-methods))
-	 (group-art (nreverse (nnmail-article-group 'nnmbox-active-number))))
+	 (group-art (nreverse (nnmail-article-group 'nnmbox-active-number)))
+	 (delim (concat "^" message-unix-mail-delimiter)))
+    (goto-char (point-min))
+    ;; This might come from somewhere else.
+    (unless (looking-at delim)
+      (insert "From nobody " (current-time-string) "\n")
+      (goto-char (point-min)))
+    ;; Quote all "From " lines in the article.
+    (forward-line 1)
+    (while (re-search-forward delim nil t)
+      (beginning-of-line)
+      (insert "> "))
     (nnmail-insert-lines)
     (nnmail-insert-xref group-art)
     (nnmbox-insert-newsgroup-line group-art)
-    (run-hooks 'nnml-prepare-save-mail-hook)
+    (run-hooks 'nnmail-prepare-save-mail-hook)
+    (run-hooks 'nnmbox-prepare-save-mail-hook)
     group-art))
 
 (defun nnmbox-insert-newsgroup-line (group-art)
@@ -405,14 +459,14 @@
 	  (forward-char -1)
 	  (while group-art
 	    (insert (format "X-Gnus-Newsgroup: %s:%d   %s\n" 
-			    (car (car group-art)) (cdr (car group-art))
+			    (caar group-art) (cdar group-art)
 			    (current-time-string)))
 	    (setq group-art (cdr group-art)))))
     t))
 
 (defun nnmbox-active-number (group)
   ;; Find the next article number in GROUP.
-  (let ((active (car (cdr (assoc group nnmbox-group-alist)))))
+  (let ((active (cadr (assoc group nnmbox-group-alist))))
     (if active
 	(setcdr active (1+ (cdr active)))
       ;; This group is new, so we create a new entry for it.
@@ -433,12 +487,29 @@
 	     (= (buffer-size) (nth 7 (file-attributes nnmbox-mbox-file)))))
       ()
     (save-excursion
-      (let ((delim (concat "^" rmail-unix-mail-delimiter))
-	    start end)
+      (let ((delim (concat "^" message-unix-mail-delimiter))
+	    (alist nnmbox-group-alist)
+	    start end number)
 	(set-buffer (setq nnmbox-mbox-buffer 
-			  (nnheader-find-file-noselect 
+			  (nnheader-find-file-noselect
 			   nnmbox-mbox-file nil 'raw)))
 	(buffer-disable-undo (current-buffer))
+
+	;; Go through the group alist and compare against
+	;; the mbox file.
+	(while alist
+	  (goto-char (point-max))
+	  (when (and (re-search-backward
+		      (format "^X-Gnus-Newsgroup: %s:\\([0-9]+\\) "
+			      (caar alist)) nil t)
+		     (>= (setq number
+			       (string-to-number 
+				(buffer-substring
+				 (match-beginning 1) (match-end 1))))
+			 (cdadar alist)))
+	    (setcdr (cadar alist) (1+ number)))
+	  (setq alist (cdr alist)))
+	
 	(goto-char (point-min))
 	(while (re-search-forward delim nil t)
 	  (setq start (match-beginning 0))
@@ -457,54 +528,6 @@
 		  (nnmbox-save-mail))))
 	  (goto-char end))))))
 
-(defun nnmbox-get-new-mail (&optional group)
-  "Read new incoming mail."
-  (let* ((spools (nnmail-get-spool-files group))
-	 (group-in group)
-	 incoming incomings)
-    (nnmbox-read-mbox)
-    (if (or (not nnmbox-get-new-mail) (not nnmail-spool-file))
-	()
-      ;; We go through all the existing spool files and split the
-      ;; mail from each.
-      (while spools
-	(and
-	 (file-exists-p (car spools))
-	 (> (nth 7 (file-attributes (car spools))) 0)
-	 (progn
-	   (and gnus-verbose-backends 
-		(message "nnmbox: Reading incoming mail..."))
-	   (if (not (setq incoming 
-			  (nnmail-move-inbox 
-			   (car spools) 
-			   (concat nnmbox-mbox-file "-Incoming"))))
-	       ()
-	     (setq incomings (cons incoming incomings))
-	     (save-excursion
-	       (setq group (nnmail-get-split-group (car spools) group-in))
-	       (let ((in-buf (nnmail-split-incoming 
-			      incoming 'nnmbox-save-mail t group)))
-		 (set-buffer nnmbox-mbox-buffer)
-		 (goto-char (point-max))
-		 (insert-buffer-substring in-buf)
-		 (kill-buffer in-buf))))))
-	(setq spools (cdr spools)))
-      ;; If we did indeed read any incoming spools, we save all info. 
-      (and (buffer-modified-p nnmbox-mbox-buffer) 
-	   (save-excursion
-	     (nnmail-save-active nnmbox-group-alist nnmbox-active-file)
-	     (set-buffer nnmbox-mbox-buffer)
-	     (save-buffer)))
-      (if incomings (run-hooks 'nnmail-read-incoming-hook))
-      (while incomings
-	(setq incoming (car incomings))
-	(and nnmail-delete-incoming
-	     (file-exists-p incoming) 
-	     (file-writable-p incoming) 
-	     (delete-file incoming))
-	(setq incomings (cdr incomings))))))
-
-
 (provide 'nnmbox)
 
 ;;; nnmbox.el ends here