X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fnnmh.el;h=cf0b6c51b3c984fbfa2c6080860c32b188aeac95;hb=507b285173baa14c25dc095f5c65d05a5474a8fe;hp=0ba5266ab5dab0350f680993b1d6355164ca2874;hpb=1f1262fa36e6242e098aa77199628058523195d4;p=gnus

diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index 0ba5266ab..cf0b6c51b 100644
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -1,5 +1,5 @@
-;;; nnmh.el --- mail spool access for Gnus (mhspool)
-;; Copyright (C) 1995 Free Software Foundation, Inc.
+;;; nnmh.el --- mhspool access for Gnus
+;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; 	Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -18,424 +18,520 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
 ;; Based on nnspool.el by Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>.
+;; For an overview of what the interface functions do, please see the
+;; Gnus sources.
 
 ;;; Code:
 
 (require 'nnheader)
-(require 'rmail)
 (require 'nnmail)
-(require 'gnus)
+(require 'gnus-start)
+(require 'nnoo)
+(require 'cl)
 
-(defvar nnmh-directory "~/Mail/"
-  "Mail directory.")
+(nnoo-declare nnmh)
 
-(defvar nnmh-get-new-mail t
-  "If non-nil, nnmh will check the incoming mail file and split the mail.")
+(defvoo nnmh-directory message-directory
+  "*Mail spool directory.")
+
+(defvoo nnmh-get-new-mail t
+  "*If non-nil, nnmh will check the incoming mail file and split the mail.")
+
+(defvoo nnmh-prepare-save-mail-hook nil
+  "*Hook run narrowed to an article before saving.")
+
+(defvoo nnmh-be-safe nil
+  "*If non-nil, nnmh will check all articles to make sure whether they are new or not.")
 
 
 
-(defconst nnmh-version "nnmh 0.1"
+(defconst nnmh-version "nnmh 1.0"
   "nnmh version.")
 
-(defvar nnmh-current-directory nil
+(defvoo nnmh-current-directory nil
   "Current news group directory.")
 
-(defvar nnmh-status-string "")
-
-(defvar nnmh-group-alist nil)
+(defvoo nnmh-status-string "")
+(defvoo nnmh-group-alist nil)
 
 
 
 ;;; Interface functions.
 
-(defun nnmh-retrieve-headers (sequence &optional newsgroup server)
-  "Retrieve the headers for the articles in SEQUENCE.
-Newsgroup must be selected before calling this function."
+(nnoo-define-basics nnmh)
+
+(deffoo nnmh-retrieve-headers (articles &optional newsgroup server fetch-old)
   (save-excursion
     (set-buffer nntp-server-buffer)
     (erase-buffer)
-    (let ((file nil)
-	  (number (length sequence))
-	  (count 0)
-	  beg article)
-      (nnmh-possibly-change-directory newsgroup)
-      (while sequence
-	(setq article (car sequence))
-	(setq file
-	      (concat nnmh-current-directory (prin1-to-string article)))
-	(if (and (file-exists-p file)
-		 (not (file-directory-p file)))
-	    (progn
-	      (insert (format "221 %d Article retrieved.\n" article))
-	      (setq beg (point))
-	      (insert-file-contents file)
-	      (goto-char beg)
-	      (if (search-forward "\n\n" nil t)
-		  (forward-char -1)
-		(goto-char (point-max))
-		(insert "\n\n"))
-	      (insert ".\n")
-	      (delete-region (point) (point-max))))
-	(setq sequence (cdr sequence))
-	(setq count (1+ count))
-	(and (numberp nnmail-large-newsgroup)
-	     (> number nnmail-large-newsgroup)
-	     (zerop (% count 20))
-	     (message "nnmh: Receiving headers... %d%%"
-		      (/ (* count 100) number))))
-
-      (and (numberp nnmail-large-newsgroup)
-	   (> number nnmail-large-newsgroup)
-	   (message "nnmh: Receiving headers... done"))
-
-      ;; Fold continuation lines.
-      (goto-char 1)
-      (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
-	(replace-match " " t t))
-      'headers)))
-
-(defun nnmh-open-server (host &optional service)
-  "Open nnmh mail backend."
-  (setq nnmh-status-string "")
-  (nnheader-init-server-buffer))
-
-(defun nnmh-close-server (&optional server)
-  "Close news server."
-  t)
-
-(defun nnmh-server-opened (&optional server)
-  "Return server process status, T or NIL.
-If the stream is opened, return T, otherwise return NIL."
-  (and nntp-server-buffer
-       (get-buffer nntp-server-buffer)))
-
-(defun nnmh-status-message (&optional server)
-  "Return server status response as string."
-  nnmh-status-string)
-
-(defun nnmh-request-article (id &optional newsgroup server buffer)
-  "Select article by message ID (or number)."
-  (nnmh-possibly-change-directory newsgroup)
+    (let* ((file nil)
+	   (number (length articles))
+	   (large (and (numberp nnmail-large-newsgroup)
+		       (> number nnmail-large-newsgroup)))
+	   (count 0)
+	   beg article)
+      (nnmh-possibly-change-directory newsgroup server)
+      ;; We don't support fetching by Message-ID.
+      (if (stringp (car articles))
+	  'headers
+	(while articles
+	  (when (and (file-exists-p
+		      (setq file (concat (file-name-as-directory
+					  nnmh-current-directory)
+					 (int-to-string
+					  (setq article (pop articles))))))
+		     (not (file-directory-p file)))
+	    (insert (format "221 %d Article retrieved.\n" article))
+	    (setq beg (point))
+	    (nnheader-insert-head file)
+	    (goto-char beg)
+	    (if (search-forward "\n\n" nil t)
+		(forward-char -1)
+	      (goto-char (point-max))
+	      (insert "\n\n"))
+	    (insert ".\n")
+	    (delete-region (point) (point-max)))
+	  (setq count (1+ count))
+
+	  (and large
+	       (zerop (% count 20))
+	       (message "nnmh: Receiving headers... %d%%"
+			(/ (* count 100) number))))
+
+	(when large
+	  (message "nnmh: Receiving headers...done"))
+
+	(nnheader-fold-continuation-lines)
+	'headers))))
+
+(deffoo nnmh-open-server (server &optional defs)
+  (nnoo-change-server 'nnmh server defs)
+  (when (not (file-exists-p nnmh-directory))
+    (condition-case ()
+	(make-directory nnmh-directory t)
+      (error t)))
+  (cond
+   ((not (file-exists-p nnmh-directory))
+    (nnmh-close-server)
+    (nnheader-report 'nnmh "Couldn't create directory: %s" nnmh-directory))
+   ((not (file-directory-p (file-truename nnmh-directory)))
+    (nnmh-close-server)
+    (nnheader-report 'nnmh "Not a directory: %s" nnmh-directory))
+   (t
+    (nnheader-report 'nnmh "Opened server %s using directory %s"
+		     server nnmh-directory)
+    t)))
+
+(deffoo nnmh-request-article (id &optional newsgroup server buffer)
+  (nnmh-possibly-change-directory newsgroup server)
   (let ((file (if (stringp id)
 		  nil
-		(concat nnmh-current-directory (prin1-to-string id))))
+		(concat nnmh-current-directory (int-to-string id))))
 	(nntp-server-buffer (or buffer nntp-server-buffer)))
-    (if (and (stringp file)
-	     (file-exists-p file)
-	     (not (file-directory-p file)))
-	(save-excursion
-	  (nnmail-find-file file)))))
-
-(defun nnmh-request-group (group &optional server dont-check)
-  "Select news GROUP."
-  (and nnmh-get-new-mail (or dont-check (nnmh-get-new-mail)))
-  (let ((pathname (nnmail-article-pathname group nnmh-directory))
+    (and (stringp file)
+	 (file-exists-p file)
+	 (not (file-directory-p file))
+	 (save-excursion (nnmail-find-file file))
+	 (string-to-int (file-name-nondirectory file)))))
+
+(deffoo nnmh-request-group (group &optional server dont-check)
+  (let ((pathname (nnmail-group-pathname group nnmh-directory))
 	dir)
-    (if (file-directory-p pathname)
-	(progn
-	  (setq nnmh-current-directory pathname)
-	  (and nnmh-get-new-mail (nnmh-update-gnus-unreads group))
-	  (or dont-check
-	      (progn
-		(setq dir 
-		      (sort
-		       (mapcar
-			(function
-			 (lambda (name)
-			   (string-to-int name)))
-			(directory-files pathname nil "^[0-9]+$" t))
-		       '<))
-		(save-excursion
-		  (set-buffer nntp-server-buffer)
-		  (erase-buffer)
-		  (if dir
-		      (insert (format "211 %d %d %d %s\n" (length dir) 
-				      (car dir)
-				      (progn (while (cdr dir)
-					       (setq dir (cdr dir)))
-					     (car dir))
-				      group))
-		    (insert (format "211 0 1 0 %s\n" group))))))
-	  t))))
-
-(defun nnmh-request-list (&optional server dir)
-  "Get list of active articles in all newsgroups."
-  (and server nnmh-get-new-mail (nnmh-get-new-mail))
-  (or dir
-      (save-excursion
-	(set-buffer nntp-server-buffer)
-	(erase-buffer)
-	(setq dir nnmh-directory)))
+    (cond
+     ((not (file-directory-p pathname))
+      (nnheader-report
+       'nnmh "Can't select group (no such directory): %s" group))
+     (t
+      (setq nnmh-current-directory pathname)
+      (and nnmh-get-new-mail
+	   nnmh-be-safe
+	   (nnmh-update-gnus-unreads group))
+      (cond
+       (dont-check
+	(nnheader-report 'nnmh "Selected group %s" group)
+	t)
+       (t
+	;; Re-scan the directory if it's on a foreign system.
+	(nnheader-re-read-dir pathname)
+	(setq dir
+	      (sort
+	       (mapcar (lambda (name) (string-to-int name))
+		       (directory-files pathname nil "^[0-9]+$" t))
+	       '<))
+	  (cond
+	   (dir
+	    (nnheader-report 'nnmh "Selected group %s" group)
+	    (nnheader-insert
+	     "211 %d %d %d %s\n" (length dir) (car dir)
+	     (progn (while (cdr dir) (setq dir (cdr dir))) (car dir))
+	     group))
+	   (t
+	    (nnheader-report 'nnmh "Empty group %s" group)
+	    (nnheader-insert (format "211 0 1 0 %s\n" group))))))))))
+
+(deffoo nnmh-request-scan (&optional group server)
+  (nnmail-get-new-mail 'nnmh nil nnmh-directory group))
+
+(deffoo nnmh-request-list (&optional server dir)
+  (nnheader-insert "")
+  (let ((nnmh-toplev
+	 (or dir (file-truename (file-name-as-directory nnmh-directory)))))
+    (nnmh-request-list-1 nnmh-toplev))
+  (setq nnmh-group-alist (nnmail-get-active))
+  t)
+
+(defvar nnmh-toplev)
+(defun nnmh-request-list-1 (dir)
   (setq dir (expand-file-name dir))
   ;; Recurse down all directories.
-  (let ((dirs (directory-files dir t nil t)))
-    (while dirs 
-      (if (and (not (string-match "/\\.\\.$" (car dirs)))
-	       (not (string-match "/\\.$" (car dirs)))
-	       (file-directory-p (car dirs)))
-	  (nnmh-request-list server (car dirs)))
-      (setq dirs (cdr dirs))))
+  (let ((dirs (and (file-readable-p dir)
+		   (> (nth 1 (file-attributes (file-chase-links dir))) 2)
+		   (directory-files dir t nil t)))
+	dir)
+    ;; Recurse down directories.
+    (while (setq dir (pop dirs))
+      (when (and (not (member (file-name-nondirectory dir) '("." "..")))
+		 (file-directory-p dir)
+		 (file-readable-p dir))
+	(nnmh-request-list-1 dir))))
   ;; For each directory, generate an active file line.
-  (if (not (string= (expand-file-name nnmh-directory) dir))
-      (let ((files (mapcar
-		    (lambda (name) (string-to-int name))
-		    (directory-files dir nil "^[0-9]+$" t))))
+  (unless (string= (expand-file-name nnmh-toplev) dir)
+    (let ((files (mapcar
+		  (lambda (name) (string-to-int name))
+		  (directory-files dir nil "^[0-9]+$" t))))
+      (when files
 	(save-excursion
 	  (set-buffer nntp-server-buffer)
-	  (insert 
-	   (format 
-	    "%s %d %d y\n" 
+	  (goto-char (point-max))
+	  (insert
+	   (format
+	    "%s %d %d y\n"
 	    (progn
-	      (string-match (expand-file-name nnmh-directory) dir)
-	      (nnmail-replace-chars-in-string
+	      (string-match
+	       (regexp-quote
+		(file-truename (file-name-as-directory
+				(expand-file-name nnmh-toplev))))
+	       dir)
+	      (nnheader-replace-chars-in-string
 	       (substring dir (match-end 0)) ?/ ?.))
-	    (if files (apply (function max) files) 0)
-	    (if files (apply (function min) files) 0))))))
+	    (apply 'max files)
+	    (apply 'min files)))))))
   t)
 
-(defun nnmh-request-newgroups (date &optional server)
-  "List groups created after DATE."
+(deffoo nnmh-request-newgroups (date &optional server)
   (nnmh-request-list server))
 
-(defun nnmh-request-post (&optional server)
-  "Post a new news in current buffer."
-  (mail-send-and-exit nil))
-
-(fset 'nnmh-request-post-buffer 'nnmail-request-post-buffer)
-
-(defun nnmh-request-expire-articles (articles newsgroup &optional server force)
-  "Expire all articles in the ARTICLES list in group GROUP.
-The list of unexpired articles will be returned (ie. all articles that
-were too fresh to be expired).
-If FORCE is non-nil, ARTICLES will be deleted whether they are old or not."
-  (nnmh-possibly-change-directory newsgroup)
-  (let* ((days (or (and nnmail-expiry-wait-function
-			(funcall nnmail-expiry-wait-function newsgroup))
-		   nnmail-expiry-wait))
+(deffoo nnmh-request-expire-articles (articles newsgroup
+					       &optional server force)
+  (nnmh-possibly-change-directory newsgroup server)
+  (let* ((active-articles
+	  (mapcar
+	   (function
+	    (lambda (name)
+	      (string-to-int name)))
+	   (directory-files nnmh-current-directory nil "^[0-9]+$" t)))
+	 (is-old t)
 	 article rest mod-time)
-    (if nnmail-keep-last-article
-	(progn
-	  (setq articles (sort articles '>))
-	  (setq rest (cons (car articles) rest))
-	  (setq articles (cdr articles))))
-    (while articles
-      (setq article (concat nnmh-current-directory (int-to-string
-						    (car articles))))
-      (if (setq mod-time (nth 5 (file-attributes article)))
-	  (if (or force
-		  (> (nnmail-days-between
-		      (current-time-string)
-		      (current-time-string mod-time))
-		     days))
-	      (progn
-		(message "Deleting %s..." article)
-		(condition-case ()
-		    (delete-file article)
-		  (file-error nil)))
-	    (setq rest (cons (car articles) rest))))
+    (nnmail-activate 'nnmh)
+
+    (while (and articles is-old)
+      (setq article (concat nnmh-current-directory
+			    (int-to-string (car articles))))
+      (when (setq mod-time (nth 5 (file-attributes article)))
+	(if (and (nnmh-deletable-article-p newsgroup (car articles))
+		 (setq is-old
+		       (nnmail-expired-article-p newsgroup mod-time force)))
+	    (progn
+	      (nnheader-message 5 "Deleting article %s in %s..."
+				article newsgroup)
+	      (condition-case ()
+		  (funcall nnmail-delete-file-function article)
+		(file-error
+		 (nnheader-message 1 "Couldn't delete article %s in %s"
+				   article newsgroup)
+		 (push (car articles) rest))))
+	  (push (car articles) rest)))
       (setq articles (cdr articles)))
-    rest))
+    (message "")
+    (nconc rest articles)))
 
-(defun nnmh-close-group (group &optional server)
+(deffoo nnmh-close-group (group &optional server)
   t)
 
-(defun nnmh-request-move-article 
+(deffoo nnmh-request-move-article
   (article group server accept-form &optional last)
   (let ((buf (get-buffer-create " *nnmh move*"))
 	result)
-    (and 
+    (and
+     (nnmh-deletable-article-p group article)
      (nnmh-request-article article group server)
      (save-excursion
        (set-buffer buf)
+       (erase-buffer)
        (insert-buffer-substring nntp-server-buffer)
        (setq result (eval accept-form))
        (kill-buffer (current-buffer))
        result)
-     (condition-case ()
-	 (delete-file (concat nnmh-current-directory 
-			      (int-to-string article)))
-       (file-error nil)))
- result))
-
-(defun nnmh-request-accept-article (group &optional last)
+     (progn
+       (nnmh-possibly-change-directory group server)
+       (condition-case ()
+	   (funcall nnmail-delete-file-function
+		    (concat nnmh-current-directory (int-to-string article)))
+	 (file-error nil))))
+    result))
+
+(deffoo nnmh-request-accept-article (group &optional server last noinsert)
+  (nnmh-possibly-change-directory group server)
+  (nnmail-check-syntax)
   (if (stringp group)
-      (and 
-       (nnmh-request-list)
-       (setq nnmh-group-alist (nnmail-get-active))
-       ;; We trick the choosing function into believing that only one
-       ;; group is availiable.  
-       (let ((nnmail-split-methods '(group "")))
-	 (cons group (nnmh-save-mail))))
+      (and
+       (nnmail-activate 'nnmh)
+       (car (nnmh-save-mail
+	     (list (cons group (nnmh-active-number group)))
+	     noinsert)))
     (and
-     (nnmh-request-list)
-     (setq nnmh-group-alist (nnmail-get-active))
-     (nnmh-save-mail))))
+     (nnmail-activate 'nnmh)
+     (car (nnmh-save-mail (nnmail-article-group 'nnmh-active-number)
+			  noinsert)))))
 
-(defun nnmh-request-replace-article (article group buffer)
+(deffoo nnmh-request-replace-article (article group buffer)
   (nnmh-possibly-change-directory group)
   (save-excursion
     (set-buffer buffer)
-    (condition-case ()
-	(progn
-	  (write-region (point-min) (point-max)
-			(concat nnmh-current-directory (int-to-string article))
-			nil (if gnus-verbose-backends nil 'nomesg))
-	  t)
-      (error nil))))
+    (nnmh-possibly-create-directory group)
+    (ignore-errors
+      (nnmail-write-region
+       (point-min) (point-max)
+       (concat nnmh-current-directory (int-to-string article))
+       nil (if (nnheader-be-verbose 5) nil 'nomesg))
+      t)))
+
+(deffoo nnmh-request-create-group (group &optional server args)
+  (nnmail-activate 'nnmh)
+  (unless (assoc group nnmh-group-alist)
+    (let (active)
+      (push (list group (setq active (cons 1 0)))
+	    nnmh-group-alist)
+      (nnmh-possibly-create-directory group)
+      (nnmh-possibly-change-directory group server)
+      (let ((articles (mapcar
+		       (lambda (file)
+			 (string-to-int file))
+		       (directory-files
+			nnmh-current-directory nil "^[0-9]+$"))))
+	(when articles
+	  (setcar active (apply 'min articles))
+	  (setcdr active (apply 'max articles))))))
+  t)
+
+(deffoo nnmh-request-delete-group (group &optional force server)
+  (nnmh-possibly-change-directory group server)
+  ;; Delete all articles in GROUP.
+  (if (not force)
+      ()				; Don't delete the articles.
+    (let ((articles (directory-files nnmh-current-directory t "^[0-9]+$")))
+      (while articles
+	(when (file-writable-p (car articles))
+	  (nnheader-message 5 "Deleting article %s in %s..."
+			    (car articles) group)
+	  (funcall nnmail-delete-file-function (car articles)))
+	(setq articles (cdr articles))))
+    ;; Try to delete the directory itself.
+    (ignore-errors
+      (delete-directory nnmh-current-directory)))
+  ;; Remove the group from all structures.
+  (setq nnmh-group-alist
+	(delq (assoc group nnmh-group-alist) nnmh-group-alist)
+	nnmh-current-directory nil)
+  t)
+
+(deffoo nnmh-request-rename-group (group new-name &optional server)
+  (nnmh-possibly-change-directory group server)
+  (let ((new-dir (nnmail-group-pathname new-name nnmh-directory))
+	(old-dir (nnmail-group-pathname group nnmh-directory)))
+    (when (ignore-errors
+	    (make-directory new-dir t)
+	    t)
+      ;; We move the articles file by file instead of renaming
+      ;; the directory -- there may be subgroups in this group.
+      ;; One might be more clever, I guess.
+      (let ((files (nnheader-article-to-file-alist old-dir)))
+	(while files
+	  (rename-file
+	   (concat old-dir (cdar files))
+	   (concat new-dir (cdar files)))
+	  (pop files)))
+      (when (<= (length (directory-files old-dir)) 2)
+	(ignore-errors
+	  (delete-directory old-dir)))
+      ;; That went ok, so we change the internal structures.
+      (let ((entry (assoc group nnmh-group-alist)))
+	(when entry
+	  (setcar entry new-name))
+	(setq nnmh-current-directory nil)
+	t))))
+
+(nnoo-define-skeleton nnmh)
 
 
 ;;; Internal functions.
 
-(defun nnmh-possibly-change-directory (newsgroup)
-  (if newsgroup
-      (let ((pathname (nnmail-article-pathname newsgroup nnmh-directory)))
-	(if (file-directory-p pathname)
-	    (setq nnmh-current-directory pathname)
-	  (error "No such newsgroup: %s" newsgroup)))))
-
-(defun nnmh-create-directories ()
-  (let ((methods nnmail-split-methods)
-	dir dirs)
-    (while methods
-      (setq dir (nnmail-article-pathname (car (car methods)) nnmh-directory))
-      (while (not (file-directory-p dir))
-	(setq dirs (cons dir dirs))
-	(setq dir (file-name-directory (directory-file-name dir))))
-      (while dirs
-	(if (make-directory (directory-file-name (car dirs)))
-	    (error "Could not create directory %s" (car dirs)))
-	(message "Creating mail directory %s" (car dirs))
-	(setq dirs (cdr dirs)))
-      (setq methods (cdr methods)))))
-
-(defun nnmh-save-mail ()
+(defun nnmh-possibly-change-directory (newsgroup &optional server)
+  (when (and server
+	     (not (nnmh-server-opened server)))
+    (nnmh-open-server server))
+  (when newsgroup
+    (let ((pathname (nnmail-group-pathname newsgroup nnmh-directory)))
+      (if (file-directory-p pathname)
+	  (setq nnmh-current-directory pathname)
+	(error "No such newsgroup: %s" newsgroup)))))
+
+(defun nnmh-possibly-create-directory (group)
+  (let (dir dirs)
+    (setq dir (nnmail-group-pathname group nnmh-directory))
+    (while (not (file-directory-p dir))
+      (push dir dirs)
+      (setq dir (file-name-directory (directory-file-name dir))))
+    (while dirs
+      (when (make-directory (directory-file-name (car dirs)))
+	(error "Could not create directory %s" (car dirs)))
+      (nnheader-message 5 "Creating mail directory %s" (car dirs))
+      (setq dirs (cdr dirs)))))
+
+(defun nnmh-save-mail (group-art &optional noinsert)
   "Called narrowed to an article."
-  (let ((group-art (nreverse (nnmail-article-group 'nnmh-active-number)))
-	chars nov-line lines hbeg hend)
-    (setq chars (nnmail-insert-lines))
-    (nnmail-insert-xref group-art)
-    (goto-char (point-min))
-    (while (looking-at "From ")
-      (replace-match "X-From-Line: ")
-      (forward-line 1))
-    ;; We save the article in all the newsgroups it belongs in.
-    (let ((ga group-art)
-	  first)
-      (while ga
-	(let ((file (concat (nnmail-article-pathname 
-			     (car (car ga)) nnmh-directory) 
-			    (int-to-string (cdr (car ga))))))
-	  (if first
-	      ;; It was already saved, so we just make a hard link.
-	      (add-name-to-file first file t)
-	    ;; Save the article.
-	    (write-region (point-min) (point-max) file nil nil)
-	    (setq first file)))
-	(setq ga (cdr ga))))
-    group-art))
+  (unless noinsert
+    (nnmail-insert-lines)
+    (nnmail-insert-xref group-art))
+  (run-hooks 'nnmail-prepare-save-mail-hook)
+  (run-hooks 'nnmh-prepare-save-mail-hook)
+  (goto-char (point-min))
+  (while (looking-at "From ")
+    (replace-match "X-From-Line: ")
+    (forward-line 1))
+  ;; We save the article in all the newsgroups it belongs in.
+  (let ((ga group-art)
+	first)
+    (while ga
+      (nnmh-possibly-create-directory (caar ga))
+      (let ((file (concat (nnmail-group-pathname
+			   (caar ga) nnmh-directory)
+			  (int-to-string (cdar ga)))))
+	(if first
+	    ;; It was already saved, so we just make a hard link.
+	    (funcall nnmail-crosspost-link-function first file t)
+	  ;; Save the article.
+	  (nnmail-write-region (point-min) (point-max) file nil nil)
+	  (setq first file)))
+      (setq ga (cdr ga))))
+  group-art)
 
 (defun nnmh-active-number (group)
   "Compute the next article number in GROUP."
-  (let ((active (car (cdr (assoc group nnmh-group-alist)))))
+  (let ((active (cadr (assoc group nnmh-group-alist))))
+    (unless active
+      ;; The group wasn't known to nnmh, so we just create an active
+      ;; entry for it.
+      (setq active (cons 1 0))
+      (push (list group active) nnmh-group-alist)
+      ;; Find the highest number in the group.
+      (let ((files (sort
+		    (mapcar
+		     (lambda (f)
+		       (string-to-int f))
+		     (directory-files
+		      (nnmail-group-pathname group nnmh-directory)
+		      nil "^[0-9]+$"))
+		     '>)))
+	(when files
+	  (setcdr active (car files)))))
     (setcdr active (1+ (cdr active)))
-    (let (file)
-      (while (file-exists-p
-	      (setq file (concat (nnmail-article-pathname 
-				  group nnmh-directory)
-				 (int-to-string (cdr active)))))
-	(setcdr active (1+ (cdr active)))))
+    (while (file-exists-p
+	    (concat (nnmail-group-pathname group nnmh-directory)
+		    (int-to-string (cdr active))))
+      (setcdr active (1+ (cdr active))))
     (cdr active)))
 
-(defun nnmh-get-new-mail ()
-  "Read new incoming mail."
-  (let (incoming)
-    (nnmh-create-directories)
-    (if (and nnmh-get-new-mail nnmail-spool-file
-	     (file-exists-p nnmail-spool-file)
-	     (> (nth 7 (file-attributes nnmail-spool-file)) 0))
-	(progn
-	  (message "nnmh: Reading incoming mail...")
-	  (setq incoming 
-		(nnmail-move-inbox nnmail-spool-file
-				   (concat nnmh-directory "Incoming")))
-	  (nnmh-request-list)
-	  (setq nnmh-group-alist (nnmail-get-active))
-	  (nnmail-split-incoming incoming 'nnmh-save-mail)
-	  (run-hooks 'nnmail-read-incoming-hook)
-;;         (delete-file incoming)
-	  (message "nnmh: Reading incoming mail...done")))))
-
 (defun nnmh-update-gnus-unreads (group)
   ;; Go through the .nnmh-articles file and compare with the actual
-  ;; articles in this folder. The articles that are "new" will be
+  ;; articles in this folder.  The articles that are "new" will be
   ;; marked as unread by Gnus.
   (let* ((dir nnmh-current-directory)
 	 (files (sort (mapcar (function (lambda (name) (string-to-int name)))
-			      (directory-files nnmh-current-directory 
-					       nil "^[0-9]+$" t)) '<))
+			      (directory-files nnmh-current-directory
+					       nil "^[0-9]+$" t))
+		      '<))
 	 (nnmh-file (concat dir ".nnmh-articles"))
 	 new articles)
     ;; Load the .nnmh-articles file.
-    (if (file-exists-p nnmh-file)
-	(setq articles 
-	      (let (nnmh-newsgroup-articles)
-		(condition-case nil (load nnmh-file nil t t) (error nil))
-		nnmh-newsgroup-articles)))
+    (when (file-exists-p nnmh-file)
+      (setq articles
+	    (let (nnmh-newsgroup-articles)
+	      (ignore-errors (load nnmh-file nil t t))
+	      nnmh-newsgroup-articles)))
     ;; Add all new articles to the `new' list.
     (let ((art files))
       (while art
-	(if (not (assq (car art) articles)) (setq new (cons (car art) new)))
+	(unless (assq (car art) articles)
+	  (push (car art) new))
 	(setq art (cdr art))))
     ;; Remove all deleted articles.
     (let ((art articles))
       (while art
-	(if (not (memq (car (car art)) files))
-	    (setq articles (delq (car art) articles)))
-	(setq art (cdr art))))
-    ;; Check whether the highest-numbered articles really are the ones
-    ;; that Gnus thinks they are by looking at the time-stamps.
-    (let ((art articles))
-      (while (and art 
-		  (not (equal 
-			(nth 5 (file-attributes 
-				(concat dir (int-to-string (car (car art))))))
-			(cdr (car art)))))
-	(setq articles (delq (car art) articles))
-	(setq new (cons (car (car art)) new))
+	(unless (memq (caar art) files)
+	  (setq articles (delq (car art) articles)))
 	(setq art (cdr art))))
+    ;; Check whether the articles really are the ones that Gnus thinks
+    ;; they are by looking at the time-stamps.
+    (let ((arts articles)
+	  art)
+      (while (setq art (pop arts))
+	(when (not (equal
+		    (nth 5 (file-attributes
+			    (concat dir (int-to-string (car art)))))
+		    (cdr art)))
+	  (setq articles (delq art articles))
+	  (push (car art) new))))
     ;; Go through all the new articles and add them, and their
-    ;; time-stamps to the list.
-    (let ((n new))
-      (while n
-	(setq articles 
-	      (cons (cons 
-		     (car n)
-		     (nth 5 (file-attributes 
-			     (concat dir (int-to-string (car n))))))
-		    articles))
-	(setq n (cdr n))))
+    ;; time-stamps, to the list.
+    (setq articles
+	  (nconc articles
+		 (mapcar
+		  (lambda (art)
+		    (cons art
+			  (nth 5 (file-attributes
+				  (concat dir (int-to-string art))))))
+		  new)))
     ;; Make Gnus mark all new articles as unread.
-    (or (zerop (length new))
-	(gnus-make-articles-unread 
-	 (gnus-group-prefixed-name group (list 'nnmh ""))
-	 (setq new (sort new '<))))
+    (when new
+      (gnus-make-articles-unread
+       (gnus-group-prefixed-name group (list 'nnmh ""))
+       (setq new (sort new '<))))
     ;; Sort the article list with highest numbers first.
-    (setq articles (sort articles (lambda (art1 art2) 
+    (setq articles (sort articles (lambda (art1 art2)
 				    (> (car art1) (car art2)))))
     ;; Finally write this list back to the .nnmh-articles file.
-    (save-excursion
-      (set-buffer (get-buffer-create "*nnmh out*"))
+    (nnheader-temp-write nnmh-file
       (insert ";; Gnus article active file for " group "\n\n")
       (insert "(setq nnmh-newsgroup-articles '")
-      (insert (prin1-to-string articles) ")\n")
-      (write-region (point-min) (point-max) nnmh-file nil 'nomesg)
-      (kill-buffer (current-buffer)))))
+      (gnus-prin1 articles)
+      (insert ")\n"))))
+
+(defun nnmh-deletable-article-p (group article)
+  "Say whether ARTICLE in GROUP can be deleted."
+  (let ((path (concat nnmh-current-directory (int-to-string article))))
+    ;; Writable.
+    (and (file-writable-p path)
+	 ;; We can never delete the last article in the group.
+	 (not (eq (cdr (nth 1 (assoc group nnmh-group-alist)))
+		  article)))))
 
 (provide 'nnmh)