*** empty log message ***

[gnus] / lisp / nnml.el

diff --git a/lisp/nnml.el b/lisp/nnml.el
index c2a0c29..6f88463 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -1,5 +1,5 @@
 ;;; nnml.el --- mail spool access for Gnus
 ;;; nnml.el --- mail spool access for Gnus

-;; Copyright (C) 1995,96 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.

 
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>


@@ -26,141 +26,121 @@
 
 ;; Based on nnspool.el by Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>.
 ;; For an overview of what the interface functions do, please see the
 
 ;; 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.  
+;; Gnus sources.

 
 ;;; Code:
 
 (require 'nnheader)
 (require 'nnmail)
 
 ;;; Code:
 
 (require 'nnheader)
 (require 'nnmail)

-(eval-when-compile (require 'cl))
+(require 'nnoo)
+(require 'cl)

 
 

-(defvar nnml-directory "~/Mail/"
+(nnoo-declare nnml)
+
+(defvoo nnml-directory message-directory

   "Mail spool directory.")
 
   "Mail spool directory.")
 

-(defvar nnml-active-file 
+(defvoo nnml-active-file

   (concat (file-name-as-directory nnml-directory) "active")
   "Mail active file.")
 
   (concat (file-name-as-directory nnml-directory) "active")
   "Mail active file.")
 

-(defvar nnml-newsgroups-file 
+(defvoo nnml-newsgroups-file

   (concat (file-name-as-directory nnml-directory) "newsgroups")
   "Mail newsgroups description file.")
 
   (concat (file-name-as-directory nnml-directory) "newsgroups")
   "Mail newsgroups description file.")
 

-(defvar nnml-get-new-mail t
+(defvoo nnml-get-new-mail t

   "If non-nil, nnml will check the incoming mail file and split the mail.")
 
   "If non-nil, nnml will check the incoming mail file and split the mail.")
 

-(defvar nnml-nov-is-evil nil
+(defvoo nnml-nov-is-evil nil

   "If non-nil, Gnus will never generate and use nov databases for mail groups.
 Using nov databases will speed up header fetching considerably.
   "If non-nil, Gnus will never generate and use nov databases for mail groups.
 Using nov databases will speed up header fetching considerably.

-This variable shouldn't be flipped much. If you have, for some reason,
+This variable shouldn't be flipped much.  If you have, for some reason,

 set this to t, and want to set it to nil again, you should always run
 set this to t, and want to set it to nil again, you should always run

-the `nnml-generate-nov-databases' command. The function will go
+the `nnml-generate-nov-databases' command.  The function will go

 through all nnml directories and generate nov databases for them
 through all nnml directories and generate nov databases for them

-all. This may very well take some time.")
+all.  This may very well take some time.")

 
 

-(defvar nnml-prepare-save-mail-hook nil
+(defvoo nnml-prepare-save-mail-hook nil

   "Hook run narrowed to an article before saving.")
 
   "Hook run narrowed to an article before saving.")
 

+(defvoo nnml-inhibit-expiry nil
+  "If non-nil, inhibit expiry.")
+
+

 \f
 
 (defconst nnml-version "nnml 1.0"
   "nnml version.")
 
 \f
 
 (defconst nnml-version "nnml 1.0"
   "nnml version.")
 

-(defvar nnml-nov-file-name ".overview")
+(defvoo nnml-nov-file-name ".overview")

 
 

-(defvar nnml-current-directory nil)
-(defvar nnml-current-group nil)
-(defvar nnml-status-string "")
-(defvar nnml-nov-buffer-alist nil)
-(defvar nnml-group-alist nil)
-(defvar nnml-active-timestamp nil)
-(defvar nnml-article-file-alist nil)
+(defvoo nnml-current-directory nil)
+(defvoo nnml-current-group nil)
+(defvoo nnml-status-string "")
+(defvoo nnml-nov-buffer-alist nil)
+(defvoo nnml-group-alist nil)
+(defvoo nnml-active-timestamp nil)
+(defvoo nnml-article-file-alist nil)

 
 

-(defvar nnml-generate-active-function 'nnml-generate-active-info)
+(defvoo nnml-generate-active-function 'nnml-generate-active-info)

 
 \f
 
 
 \f
 

-;; Server variables.
-
-(defvar nnml-current-server nil)
-(defvar nnml-server-alist nil)
-(defvar nnml-server-variables 
-  `((nnml-directory ,nnml-directory)
-    (nnml-active-file ,nnml-active-file)
-    (nnml-newsgroups-file ,nnml-newsgroups-file)
-    (nnml-get-new-mail ,nnml-get-new-mail)
-    (nnml-nov-is-evil ,nnml-nov-is-evil)
-    (nnml-nov-file-name ,nnml-nov-file-name)
-    (nnml-current-directory nil)
-    (nnml-generate-active-function ,nnml-generate-active-function)
-    (nnml-article-file-alist nil)
-    (nnml-prepare-save-mail-hook nil)
-    (nnml-current-group nil)
-    (nnml-status-string "")
-    (nnml-nov-buffer-alist nil)
-    (nnml-group-alist nil)
-    (nnml-active-timestamp nil)))
+;;; Interface functions.

 
 

-\f
+(nnoo-define-basics nnml)

 
 

-;;; Interface functions.
+(deffoo nnml-retrieve-headers (sequence &optional group server fetch-old)
+  (when (nnml-possibly-change-directory group server)
+    (save-excursion
+      (set-buffer nntp-server-buffer)
+      (erase-buffer)
+      (let ((file nil)
+           (number (length sequence))
+           (count 0)
+           beg article)
+       (if (stringp (car sequence))
+           'headers
+         (if (nnml-retrieve-headers-with-nov sequence fetch-old)
+             'nov
+           (while sequence
+             (setq article (car sequence))
+             (setq file (nnml-article-to-file article))
+             (when (and file
+                        (file-exists-p file)
+                        (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 sequence (cdr sequence))
+             (setq count (1+ count))
+             (and (numberp nnmail-large-newsgroup)
+                  (> number nnmail-large-newsgroup)
+                  (zerop (% count 20))
+                  (nnheader-message 6 "nnml: Receiving headers... %d%%"
+                                    (/ (* count 100) number))))

 
 

-(defun nnml-retrieve-headers (sequence &optional newsgroup server fetch-old)
-  (save-excursion
-    (set-buffer nntp-server-buffer)
-    (erase-buffer)
-    (let ((file nil)
-         (number (length sequence))
-         (count 0)
-         beg article)
-      (if (stringp (car sequence))
-         'headers
-       (nnml-possibly-change-directory newsgroup)
-       (unless nnml-article-file-alist
-         (setq nnml-article-file-alist
-               (nnheader-article-to-file-alist nnml-current-directory)))
-       (if (nnml-retrieve-headers-with-nov sequence fetch-old)
-           'nov
-         (while sequence
-           (setq article (car sequence))
-           (setq file 
-                 (concat nnml-current-directory 
-                         (or (cdr (assq article nnml-article-file-alist))
-                             "")))
-           (if (and (file-exists-p file)
-                    (not (file-directory-p file)))
-               (progn
-                 (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 sequence (cdr sequence))
-           (setq count (1+ count))

            (and (numberp nnmail-large-newsgroup)
                 (> number nnmail-large-newsgroup)
            (and (numberp nnmail-large-newsgroup)
                 (> number nnmail-large-newsgroup)

-                (zerop (% count 20))
-                (nnheader-message 6 "nnml: Receiving headers... %d%%"
-                                  (/ (* count 100) number))))
-
-         (and (numberp nnmail-large-newsgroup)
-              (> number nnmail-large-newsgroup)
-              (nnheader-message 6 "nnml: Receiving headers...done"))
+                (nnheader-message 6 "nnml: Receiving headers...done"))

 
 

-         (nnheader-fold-continuation-lines)
-         'headers)))))
+           (nnheader-fold-continuation-lines)
+           'headers))))))

 
 

-(defun nnml-open-server (server &optional defs)
-  (nnheader-change-server 'nnml server defs)
+(deffoo nnml-open-server (server &optional defs)
+  (nnoo-change-server 'nnml server defs)

   (when (not (file-exists-p nnml-directory))
     (condition-case ()
        (make-directory nnml-directory t)
   (when (not (file-exists-p nnml-directory))
     (condition-case ()
        (make-directory nnml-directory t)

-      (error t)))
-  (cond 
+      (error)))
+  (cond

    ((not (file-exists-p nnml-directory))
     (nnml-close-server)
     (nnheader-report 'nnml "Couldn't create directory: %s" nnml-directory))
    ((not (file-exists-p nnml-directory))
     (nnml-close-server)
     (nnheader-report 'nnml "Couldn't create directory: %s" nnml-directory))


@@ -172,39 +152,27 @@ all. This may very well take some time.")
                     server nnml-directory)
     t)))
 
                     server nnml-directory)
     t)))
 

-(defun nnml-close-server (&optional server)
-  (setq nnml-current-server nil
-       nnml-group-alist nil)
+(defun nnml-request-regenerate (server)
+  (nnml-possibly-change-directory nil server)
+  (nnml-generate-nov-databases)

   t)
 
   t)
 

-(defun nnml-server-opened (&optional server)
-  (and (equal server nnml-current-server)
-       nntp-server-buffer
-       (buffer-name nntp-server-buffer)))
-
-(defun nnml-status-message (&optional server)
-  nnml-status-string)
-
-(defun nnml-request-article (id &optional newsgroup server buffer)
-  (nnml-possibly-change-directory newsgroup)
+(deffoo nnml-request-article (id &optional group server buffer)
+  (nnml-possibly-change-directory group server)

   (let* ((nntp-server-buffer (or buffer nntp-server-buffer))
   (let* ((nntp-server-buffer (or buffer nntp-server-buffer))

-        file path gpath group-num)
+        path gpath group-num)

     (if (stringp id)
        (when (and (setq group-num (nnml-find-group-number id))
     (if (stringp id)
        (when (and (setq group-num (nnml-find-group-number id))

-                  (setq file (cdr
-                              (assq (cdr group-num) 
-                                    (nnheader-article-to-file-alist
-                                     (setq gpath
-                                           (nnmail-group-pathname
-                                            (car group-num) 
-                                            nnml-directory)))))))
+                  (cdr
+                   (assq (cdr group-num)
+                         (nnheader-article-to-file-alist
+                          (setq gpath
+                                (nnmail-group-pathname
+                                 (car group-num)
+                                 nnml-directory))))))

          (setq path (concat gpath (int-to-string (cdr group-num)))))
          (setq path (concat gpath (int-to-string (cdr group-num)))))

-      (unless nnml-article-file-alist
-       (setq nnml-article-file-alist
-             (nnheader-article-to-file-alist nnml-current-directory)))
-      (when (setq file (cdr (assq id nnml-article-file-alist)))
-       (setq path (concat nnml-current-directory file))))
-    (cond 
+      (setq path (nnml-article-to-file id)))
+    (cond

      ((not path)
       (nnheader-report 'nnml "No such article: %s" id))
      ((not (file-exists-p path))
      ((not path)
       (nnheader-report 'nnml "No such article: %s" id))
      ((not (file-exists-p path))


@@ -216,115 +184,111 @@ all. This may very well take some time.")
      (t
       (nnheader-report 'nnml "Article %s retrieved" id)
       ;; We return the article number.
      (t
       (nnheader-report 'nnml "Article %s retrieved" id)
       ;; We return the article number.

-      (cons newsgroup (string-to-int (file-name-nondirectory path)))))))
+      (cons (if group-num (car group-num) group)
+           (string-to-int (file-name-nondirectory path)))))))

 
 

-(defun nnml-request-group (group &optional server dont-check)
-  (cond 
-   ((not (nnml-possibly-change-directory group))
+(deffoo nnml-request-group (group &optional server dont-check)
+  (cond
+   ((not (nnml-possibly-change-directory group server))

     (nnheader-report 'nnml "Invalid group (no such directory)"))
     (nnheader-report 'nnml "Invalid group (no such directory)"))

-   (dont-check 
+   ((not (file-exists-p nnml-current-directory))
+    (nnheader-report 'nnml "Directory %s does not exist"
+                    nnml-current-directory))
+   ((not (file-directory-p nnml-current-directory))
+    (nnheader-report 'nnml "%s is not a directory" nnml-current-directory))
+   (dont-check

     (nnheader-report 'nnml "Group %s selected" group)
     t)
    (t
     (nnheader-report 'nnml "Group %s selected" group)
     t)
    (t

+    (nnheader-re-read-dir nnml-current-directory)

     (nnmail-activate 'nnml)
     (let ((active (nth 1 (assoc group nnml-group-alist))))
       (if (not active)
          (nnheader-report 'nnml "No such group: %s" group)
        (nnheader-report 'nnml "Selected group %s" group)
     (nnmail-activate 'nnml)
     (let ((active (nth 1 (assoc group nnml-group-alist))))
       (if (not active)
          (nnheader-report 'nnml "No such group: %s" group)
        (nnheader-report 'nnml "Selected group %s" group)

-       (nnheader-insert "211 %d %d %d %s\n" 
+       (nnheader-insert "211 %d %d %d %s\n"

                         (max (1+ (- (cdr active) (car active))) 0)
                         (car active) (cdr active) group))))))
 
                         (max (1+ (- (cdr active) (car active))) 0)
                         (car active) (cdr active) group))))))
 

-(defun nnml-request-scan (&optional group server)
+(deffoo nnml-request-scan (&optional group server)

   (setq nnml-article-file-alist nil)
   (setq nnml-article-file-alist nil)

+  (nnml-possibly-change-directory group server)

   (nnmail-get-new-mail 'nnml 'nnml-save-nov nnml-directory group))
 
   (nnmail-get-new-mail 'nnml 'nnml-save-nov nnml-directory group))
 

-(defun nnml-close-group (group &optional server)
-  t)
-
-(defun nnml-request-close ()
-  (setq nnml-current-server nil)
-  (setq nnml-server-alist nil)
+(deffoo nnml-close-group (group &optional server)
+  (setq nnml-article-file-alist nil)

   t)
 
   t)
 

-(defun nnml-request-create-group (group &optional server) 
+(deffoo nnml-request-create-group (group &optional server args)

   (nnmail-activate 'nnml)
   (nnmail-activate 'nnml)

-  (or (assoc group nnml-group-alist)
-      (let (active)
-       (setq nnml-group-alist (cons (list group (setq active (cons 1 0)))
-                                    nnml-group-alist))
-       (nnml-possibly-create-directory group)
-       (nnml-possibly-change-directory group)
-       (let ((articles 
-              (nnheader-directory-articles nnml-current-directory )))
-         (and articles
-              (progn
-                (setcar active (apply 'min articles))
-                (setcdr active (apply 'max articles)))))
-       (nnmail-save-active nnml-group-alist nnml-active-file)))
+  (unless (assoc group nnml-group-alist)
+    (let (active)
+      (push (list group (setq active (cons 1 0)))
+           nnml-group-alist)
+      (nnml-possibly-create-directory group)
+      (nnml-possibly-change-directory group server)
+      (let ((articles (nnheader-directory-articles nnml-current-directory)))
+       (when articles
+         (setcar active (apply 'min articles))
+         (setcdr active (apply 'max articles))))
+      (nnmail-save-active nnml-group-alist nnml-active-file)))

   t)
 
   t)
 

-(defun nnml-request-list (&optional server)
+(deffoo nnml-request-list (&optional server)

   (save-excursion
     (nnmail-find-file nnml-active-file)
   (save-excursion
     (nnmail-find-file nnml-active-file)

-    (setq nnml-group-alist (nnmail-get-active))))
+    (setq nnml-group-alist (nnmail-get-active))
+    t))

 
 

-(defun nnml-request-newgroups (date &optional server)
+(deffoo nnml-request-newgroups (date &optional server)

   (nnml-request-list server))
 
   (nnml-request-list server))
 

-(defun nnml-request-list-newsgroups (&optional server)
+(deffoo nnml-request-list-newsgroups (&optional server)

   (save-excursion
     (nnmail-find-file nnml-newsgroups-file)))
 
   (save-excursion
     (nnmail-find-file nnml-newsgroups-file)))
 

-(defun nnml-request-expire-articles (articles newsgroup &optional server force)
-  (nnml-possibly-change-directory newsgroup)
-  (let* ((active-articles 
+(deffoo nnml-request-expire-articles (articles group
+                                              &optional server force)
+  (nnml-possibly-change-directory group server)
+  (let* ((active-articles

          (nnheader-directory-articles nnml-current-directory))
         (is-old t)
         article rest mod-time number)
     (nnmail-activate 'nnml)
 
          (nnheader-directory-articles nnml-current-directory))
         (is-old t)
         article rest mod-time number)
     (nnmail-activate 'nnml)
 

-    (unless nnml-article-file-alist
-      (setq nnml-article-file-alist
-           (nnheader-article-to-file-alist nnml-current-directory)))
-

     (while (and articles is-old)
     (while (and articles is-old)

-      (setq article (concat nnml-current-directory 
-                           (int-to-string 
-                            (setq number (pop articles)))))
-      (when (setq mod-time (nth 5 (file-attributes article)))
-       (if (and (nnml-deletable-article-p newsgroup number)
-                (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
-                (push number rest)))
-             (setq active-articles (delq number active-articles))
-             (nnml-nov-delete-article newsgroup number))
-         (push number rest))))
-    (let ((active (nth 1 (assoc newsgroup nnml-group-alist))))
+      (when (setq article (nnml-article-to-file (setq number (pop articles))))
+       (when (setq mod-time (nth 5 (file-attributes article)))
+         (if (and (nnml-deletable-article-p group number)
+                  (setq is-old
+                        (nnmail-expired-article-p group mod-time force
+                                                  nnml-inhibit-expiry)))
+             (progn
+               (nnheader-message 5 "Deleting article %s in %s"
+                                 article group)
+               (condition-case ()
+                   (funcall nnmail-delete-file-function article)
+                 (file-error
+                  (push number rest)))
+               (setq active-articles (delq number active-articles))
+               (nnml-nov-delete-article group number))
+           (push number rest)))))
+    (let ((active (nth 1 (assoc group nnml-group-alist))))

       (when active
        (setcar active (or (and active-articles
                                (apply 'min active-articles))
                           (1+ (cdr active)))))
       (nnmail-save-active nnml-group-alist nnml-active-file))
     (nnml-save-nov)
       (when active
        (setcar active (or (and active-articles
                                (apply 'min active-articles))
                           (1+ (cdr active)))))
       (nnmail-save-active nnml-group-alist nnml-active-file))
     (nnml-save-nov)

-    (message "")

     (nconc rest articles)))
 
     (nconc rest articles)))
 

-(defun nnml-request-move-article 
+(deffoo nnml-request-move-article

   (article group server accept-form &optional last)
   (let ((buf (get-buffer-create " *nnml move*"))
        result)
   (article group server accept-form &optional last)
   (let ((buf (get-buffer-create " *nnml move*"))
        result)

-    (nnml-possibly-change-directory group)
-    (unless nnml-article-file-alist
-      (setq nnml-article-file-alist
-           (nnheader-article-to-file-alist nnml-current-directory)))
-    (and 
+    (nnml-possibly-change-directory group server)
+    (nnml-update-file-alist)
+    (and

      (nnml-deletable-article-p group article)
      (nnml-request-article article group server)
      (save-excursion
      (nnml-deletable-article-p group article)
      (nnml-request-article article group server)
      (save-excursion


@@ -334,55 +298,61 @@ all. This may very well take some time.")
        (kill-buffer (current-buffer))
        result)
      (progn
        (kill-buffer (current-buffer))
        result)
      (progn

+       (nnml-possibly-change-directory group server)

        (condition-case ()
           (funcall nnmail-delete-file-function
        (condition-case ()
           (funcall nnmail-delete-file-function

-                   (concat nnml-current-directory 
-                           (int-to-string article)))
+                   (nnml-article-to-file  article))

         (file-error nil))
        (nnml-nov-delete-article group article)
         (file-error nil))
        (nnml-nov-delete-article group article)

-       (and last (nnml-save-nov))))
+       (when last
+        (nnml-save-nov)
+        (nnmail-save-active nnml-group-alist nnml-active-file))))

     result))
 
     result))
 

-(defun nnml-request-accept-article (group &optional last)
+(deffoo nnml-request-accept-article (group &optional server last)
+  (nnml-possibly-change-directory group server)
+  (nnmail-check-syntax)

   (let (result)
   (let (result)

+    (nnmail-cache-insert (nnmail-fetch-field "message-id"))

     (if (stringp group)
     (if (stringp group)

-       (and 
+       (and

         (nnmail-activate 'nnml)
         (nnmail-activate 'nnml)

-        ;; We trick the choosing function into believing that only one
-        ;; group is available.  
-        (let ((nnmail-split-methods (list (list group ""))))
-          (setq result (car (nnml-save-mail))))
+        (setq result (car (nnml-save-mail
+                           (list (cons group (nnml-active-number group))))))

         (progn
           (nnmail-save-active nnml-group-alist nnml-active-file)
           (and last (nnml-save-nov))))
       (and
        (nnmail-activate 'nnml)
         (progn
           (nnmail-save-active nnml-group-alist nnml-active-file)
           (and last (nnml-save-nov))))
       (and
        (nnmail-activate 'nnml)

-       (setq result (car (nnml-save-mail)))
-       (progn
+       (setq result (car (nnml-save-mail
+                         (nnmail-article-group 'nnml-active-number))))
+       (when last

         (nnmail-save-active nnml-group-alist nnml-active-file)
         (nnmail-save-active nnml-group-alist nnml-active-file)

-        (and last (nnml-save-nov)))))
+        (nnmail-cache-close)
+        (nnml-save-nov))))

     result))
 
     result))
 

-(defun nnml-request-replace-article (article group buffer)
+(deffoo nnml-request-replace-article (article group buffer)

   (nnml-possibly-change-directory group)
   (save-excursion
     (set-buffer buffer)
     (nnml-possibly-create-directory group)
   (nnml-possibly-change-directory group)
   (save-excursion
     (set-buffer buffer)
     (nnml-possibly-create-directory group)

-    (if (not (condition-case ()
-                (progn
-                  (write-region (point-min) (point-max)
-                                (concat nnml-current-directory 
-                                        (int-to-string article))
-                                nil (if (nnheader-be-verbose 5) nil 'nomesg))
-                  t)
-              (error nil)))
-       ()
-      (let ((chars (nnmail-insert-lines))
-           (art (concat (int-to-string article) "\t"))
-           nov-line)
-       (setq nov-line (nnml-make-nov-line chars))
+    (let ((chars (nnmail-insert-lines))
+         (art (concat (int-to-string article) "\t"))
+         headers)
+      (when (condition-case ()
+               (progn
+                 (nnmail-write-region
+                  (point-min) (point-max)
+                  (or (nnml-article-to-file article)
+                      (concat nnml-current-directory
+                              (int-to-string article)))
+                  nil (if (nnheader-be-verbose 5) nil 'nomesg))
+                 t)
+             (error nil))
+       (setq headers (nnml-parse-head chars article))

        ;; Replace the NOV line in the NOV file.
        ;; Replace the NOV line in the NOV file.

-       (save-excursion 
+       (save-excursion

          (set-buffer (nnml-open-nov group))
          (goto-char (point-min))
          (if (or (looking-at art)
          (set-buffer (nnml-open-nov group))
          (goto-char (point-min))
          (if (or (looking-at art)


@@ -391,30 +361,30 @@ all. This may very well take some time.")
              (delete-region (progn (beginning-of-line) (point))
                             (progn (forward-line 1) (point)))
            ;; The line isn't here, so we have to find out where
              (delete-region (progn (beginning-of-line) (point))
                             (progn (forward-line 1) (point)))
            ;; The line isn't here, so we have to find out where

-           ;; we should insert it. (This situation should never
+           ;; we should insert it.  (This situation should never

            ;; occur, but one likes to make sure...)
            (while (and (looking-at "[0-9]+\t")
            ;; occur, but one likes to make sure...)
            (while (and (looking-at "[0-9]+\t")

-                       (< (string-to-int 
-                           (buffer-substring 
+                       (< (string-to-int
+                           (buffer-substring

                             (match-beginning 0) (match-end 0)))
                           article)
                        (zerop (forward-line 1)))))
          (beginning-of-line)
                             (match-beginning 0) (match-end 0)))
                           article)
                        (zerop (forward-line 1)))))
          (beginning-of-line)

-         (insert (int-to-string article) nov-line)
+         (nnheader-insert-nov headers)

          (nnml-save-nov)
          t)))))
 
          (nnml-save-nov)
          t)))))
 

-(defun nnml-request-delete-group (group &optional force server)
-  (nnml-possibly-change-directory group)
+(deffoo nnml-request-delete-group (group &optional force server)
+  (nnml-possibly-change-directory group server)

   (when force
     ;; Delete all articles in GROUP.
   (when force
     ;; Delete all articles in GROUP.

-    (let ((articles 
-          (directory-files 
+    (let ((articles
+          (directory-files

            nnml-current-directory t
            (concat nnheader-numerical-short-files
                    "\\|" (regexp-quote nnml-nov-file-name) "$")))
          article)
            nnml-current-directory t
            (concat nnheader-numerical-short-files
                    "\\|" (regexp-quote nnml-nov-file-name) "$")))
          article)

-      (while articles 
+      (while articles

        (setq article (pop articles))
        (when (file-writable-p article)
          (nnheader-message 5 "Deleting article %s in %s..." article group)
        (setq article (pop articles))
        (when (file-writable-p article)
          (nnheader-message 5 "Deleting article %s in %s..." article group)


@@ -424,7 +394,7 @@ all. This may very well take some time.")
        (delete-directory nnml-current-directory)
       (error nil)))
   ;; Remove the group from all structures.
        (delete-directory nnml-current-directory)
       (error nil)))
   ;; Remove the group from all structures.

-  (setq nnml-group-alist 
+  (setq nnml-group-alist

        (delq (assoc group nnml-group-alist) nnml-group-alist)
        nnml-current-group nil
        nnml-current-directory nil)
        (delq (assoc group nnml-group-alist) nnml-group-alist)
        nnml-current-group nil
        nnml-current-directory nil)


@@ -432,46 +402,73 @@ all. This may very well take some time.")
   (nnmail-save-active nnml-group-alist nnml-active-file)
   t)
 
   (nnmail-save-active nnml-group-alist nnml-active-file)
   t)
 

-(defun nnml-request-rename-group (group new-name &optional server)
-  (nnml-possibly-change-directory group)
-  ;; Rename directory.
-  (and (file-writable-p nnml-current-directory)
-       (condition-case ()
-          (let ((parent 
-                 (file-name-directory
-                  (directory-file-name 
-                   (nnmail-group-pathname new-name nnml-directory)))))
-            (unless (file-exists-p parent)
-              (make-directory parent t))
-            (rename-file 
-             (directory-file-name nnml-current-directory)
-             (directory-file-name 
-              (nnmail-group-pathname new-name nnml-directory)))
-            t)
-        (error nil))
-       ;; That went ok, so we change the internal structures.
-       (let ((entry (assoc group nnml-group-alist)))
-        (and entry (setcar entry new-name))
-        (setq nnml-current-directory nil
-              nnml-current-group nil)
-        ;; Save the new group alist.
-        (nnmail-save-active nnml-group-alist nnml-active-file)
-        t)))
+(deffoo nnml-request-rename-group (group new-name &optional server)
+  (nnml-possibly-change-directory group server)
+  (let ((new-dir (nnmail-group-pathname new-name nnml-directory))
+       (old-dir (nnmail-group-pathname group nnml-directory)))
+    (when (condition-case ()
+             (progn
+               (make-directory new-dir t)
+               t)
+           (error nil))
+      ;; 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)))
+      ;; Move .overview file.
+      (let ((overview (concat old-dir nnml-nov-file-name)))
+       (when (file-exists-p overview)
+         (rename-file overview (concat new-dir nnml-nov-file-name))))
+      (when (<= (length (directory-files old-dir)) 2)
+       (condition-case ()
+           (delete-directory old-dir)
+         (error nil)))
+      ;; That went ok, so we change the internal structures.
+      (let ((entry (assoc group nnml-group-alist)))
+       (when entry
+         (setcar entry new-name))
+       (setq nnml-current-directory nil
+             nnml-current-group nil)
+       ;; Save the new group alist.
+       (nnmail-save-active nnml-group-alist nnml-active-file)
+       t))))
+
+(deffoo nnml-set-status (article name value &optional group server)
+  (nnml-possibly-change-directory group server)
+  (let ((file (nnml-article-to-file article)))
+    (cond
+     ((not (file-exists-p file))
+      (nnheader-report 'nnml "File %s does not exist" file))
+     (t
+      (nnheader-temp-write file
+       (nnheader-insert-file-contents file)
+       (nnmail-replace-status name value))
+      t))))

 
 \f
 ;;; Internal functions.
 
 
 \f
 ;;; Internal functions.
 

-(defun nnml-deletable-article-p (group article)
-  "Say whether ARTICLE in GROUP can be deleted."
-  (let (file path)
+(defun nnml-article-to-file (article)
+  (nnml-update-file-alist)
+  (let (file)

     (when (setq file (cdr (assq article nnml-article-file-alist)))
     (when (setq file (cdr (assq article nnml-article-file-alist)))

-      (setq path (concat nnml-current-directory file))
-      (and (file-writable-p path)
-          (or (not nnmail-keep-last-article)
-              (not (eq (cdr (nth 1 (assoc group nnml-group-alist))) 
-                       article)))))))
+      (concat nnml-current-directory file))))

 
 

-;; Find an article number in the current group given the Message-ID. 
+(defun nnml-deletable-article-p (group article)
+  "Say whether ARTICLE in GROUP can be deleted."
+  (let (path)
+    (when (setq path (nnml-article-to-file article))
+      (when (file-writable-p path)
+       (or (not nnmail-keep-last-article)
+           (not (eq (cdr (nth 1 (assoc group nnml-group-alist)))
+                    article)))))))
+
+;; Find an article number in the current group given the Message-ID.

 (defun nnml-find-group-number (id)
   (save-excursion
     (set-buffer (get-buffer-create " *nnml id*"))
 (defun nnml-find-group-number (id)
   (save-excursion
     (set-buffer (get-buffer-create " *nnml id*"))


@@ -480,7 +477,7 @@ all. This may very well take some time.")
          number)
       ;; We want to look through all .overview files, but we want to
       ;; start with the one in the current directory.  It seems most
          number)
       ;; We want to look through all .overview files, but we want to
       ;; start with the one in the current directory.  It seems most

-      ;; likely that the article we are looking for is in that group. 
+      ;; likely that the article we are looking for is in that group.

       (if (setq number (nnml-find-id nnml-current-group id))
          (cons nnml-current-group number)
        ;; It wasn't there, so we look through the other groups as well.
       (if (setq number (nnml-find-id nnml-current-group id))
          (cons nnml-current-group number)
        ;; It wasn't there, so we look through the other groups as well.


@@ -499,106 +496,99 @@ all. This may very well take some time.")
                     nnml-nov-file-name))
        number found)
     (when (file-exists-p nov)
                     nnml-nov-file-name))
        number found)
     (when (file-exists-p nov)

-      (insert-file-contents nov)
-      (while (and (not found) 
+      (nnheader-insert-file-contents nov)
+      (while (and (not found)

                  (search-forward id nil t)) ; We find the ID.
        ;; And the id is in the fourth field.
                  (search-forward id nil t)) ; We find the ID.
        ;; And the id is in the fourth field.

-       (if (search-backward 
-            "\t" (save-excursion (beginning-of-line) (point)) t 4)
-           (progn
-             (beginning-of-line)
-             (setq found t)
-             ;; We return the article number.
-             (setq number
-                   (condition-case ()
-                       (read (current-buffer))
-                     (error nil))))))
+       (if (not (and (search-backward "\t" nil t 4)
+                     (not (search-backward"\t" (gnus-point-at-bol) t))))
+           (forward-line 1)
+         (beginning-of-line)
+         (setq found t)
+         ;; We return the article number.
+         (setq number
+               (condition-case ()
+                   (read (current-buffer))
+                 (error nil)))))

       number)))
 
 (defun nnml-retrieve-headers-with-nov (articles &optional fetch-old)
   (if (or gnus-nov-is-evil nnml-nov-is-evil)
       nil
       number)))
 
 (defun nnml-retrieve-headers-with-nov (articles &optional fetch-old)
   (if (or gnus-nov-is-evil nnml-nov-is-evil)
       nil

-    (let ((first (car articles))
-         (last (progn (while (cdr articles) (setq articles (cdr articles)))
-                      (car articles)))
-         (nov (concat nnml-current-directory nnml-nov-file-name)))
-      (if (file-exists-p nov)
-         (save-excursion
-           (set-buffer nntp-server-buffer)
-           (erase-buffer)
-           (insert-file-contents nov)
-           (if (and fetch-old
-                    (not (numberp fetch-old)))
-               t                       ; Don't remove anything.
-             (if fetch-old
-                 (setq first (max 1 (- first fetch-old))))
-             (goto-char (point-min))
-             (while (and (not (eobp)) (< first (read (current-buffer))))
-               (forward-line 1))
-             (beginning-of-line)
-             (if (not (eobp)) (delete-region 1 (point)))
-             (while (and (not (eobp)) (>= last (read (current-buffer))))
-               (forward-line 1))
-             (beginning-of-line)
-             (if (not (eobp)) (delete-region (point) (point-max)))
-             t))))))
-
-(defun nnml-possibly-change-directory (group &optional force)
-  (when group
+    (let ((nov (concat nnml-current-directory nnml-nov-file-name)))
+      (when (file-exists-p nov)
+       (save-excursion
+         (set-buffer nntp-server-buffer)
+         (erase-buffer)
+         (nnheader-insert-file-contents nov)
+         (if (and fetch-old
+                  (not (numberp fetch-old)))
+             t                         ; Don't remove anything.
+           (nnheader-nov-delete-outside-range
+            (if fetch-old (max 1 (- (car articles) fetch-old))
+              (car articles))
+            (car (last articles)))
+           t))))))
+
+(defun nnml-possibly-change-directory (group &optional server)
+  (when (and server
+            (not (nnml-server-opened server)))
+    (nnml-open-server server))
+  (if (not group)
+      t

     (let ((pathname (nnmail-group-pathname group nnml-directory)))
     (let ((pathname (nnmail-group-pathname group nnml-directory)))

-      (when (or force
-               (not (equal pathname nnml-current-directory)))
+      (when (not (equal pathname nnml-current-directory))

        (setq nnml-current-directory pathname
              nnml-current-group group
        (setq nnml-current-directory pathname
              nnml-current-group group

-             nnml-article-file-alist nil))))
-  t)
+             nnml-article-file-alist nil))
+      (file-exists-p nnml-current-directory))))

 
 (defun nnml-possibly-create-directory (group)
   (let (dir dirs)
     (setq dir (nnmail-group-pathname group nnml-directory))
     (while (not (file-directory-p dir))
 
 (defun nnml-possibly-create-directory (group)
   (let (dir dirs)
     (setq dir (nnmail-group-pathname group nnml-directory))
     (while (not (file-directory-p dir))

-      (setq dirs (cons dir dirs))
+      (push dir dirs)

       (setq dir (file-name-directory (directory-file-name dir))))
     (while dirs
       (make-directory (directory-file-name (car dirs)))
       (nnheader-message 5 "Creating mail directory %s" (car dirs))
       (setq dirs (cdr dirs)))))
       (setq dir (file-name-directory (directory-file-name dir))))
     (while dirs
       (make-directory (directory-file-name (car dirs)))
       (nnheader-message 5 "Creating mail directory %s" (car dirs))
       (setq dirs (cdr dirs)))))

-            
-(defun nnml-save-mail ()
+
+(defun nnml-save-mail (group-art)

   "Called narrowed to an article."
   "Called narrowed to an article."

-  (let ((group-art (nreverse (nnmail-article-group 'nnml-active-number)))
-       chars nov-line)
+  (let (chars headers)

     (setq chars (nnmail-insert-lines))
     (nnmail-insert-xref group-art)
     (setq chars (nnmail-insert-lines))
     (nnmail-insert-xref group-art)

+    (run-hooks 'nnmail-prepare-save-mail-hook)

     (run-hooks 'nnml-prepare-save-mail-hook)
     (goto-char (point-min))
     (while (looking-at "From ")
       (replace-match "X-From-Line: ")
       (forward-line 1))
     (run-hooks 'nnml-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.
+    ;; We save the article in all the groups it belongs in.

     (let ((ga group-art)
          first)
       (while ga
        (nnml-possibly-create-directory (caar ga))
     (let ((ga group-art)
          first)
       (while ga
        (nnml-possibly-create-directory (caar ga))

-       (let ((file (concat (nnmail-group-pathname 
+       (let ((file (concat (nnmail-group-pathname

                             (caar ga) nnml-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.
                             (caar ga) nnml-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.

-           (write-region (point-min) (point-max) file nil 
-                         (if (nnheader-be-verbose 5) nil 'nomesg))
+           (nnmail-write-region (point-min) (point-max) file nil
+                                (if (nnheader-be-verbose 5) nil 'nomesg))

            (setq first file)))
        (setq ga (cdr ga))))
            (setq first file)))
        (setq ga (cdr ga))))

-    ;; Generate a nov line for this article. We generate the nov
+    ;; Generate a nov line for this article.  We generate the nov

     ;; line after saving, because nov generation destroys the
     ;; line after saving, because nov generation destroys the

-    ;; header. 
-    (setq nov-line (nnml-make-nov-line chars))
+    ;; header.
+    (setq headers (nnml-parse-head chars))

     ;; Output the nov line to all nov databases that should have it.
     (let ((ga group-art))
       (while ga
     ;; Output the nov line to all nov databases that should have it.
     (let ((ga group-art))
       (while ga

-       (nnml-add-nov (caar ga) (cdar ga) nov-line)
+       (nnml-add-nov (caar ga) (cdar ga) headers)

        (setq ga (cdr ga))))
     group-art))
 
        (setq ga (cdr ga))))
     group-art))
 


@@ -606,11 +596,23 @@ all. This may very well take some time.")
   "Compute the next article number in GROUP."
   (let ((active (cadr (assoc group nnml-group-alist))))
     ;; The group wasn't known to nnml, so we just create an active
   "Compute the next article number in GROUP."
   (let ((active (cadr (assoc group nnml-group-alist))))
     ;; The group wasn't known to nnml, so we just create an active

-    ;; entry for it.   
-    (or active
-       (progn
-         (setq active (cons 1 0))
-         (setq nnml-group-alist (cons (list group active) nnml-group-alist))))
+    ;; entry for it.
+    (unless active
+      ;; Perhaps the active file was corrupt?  See whether
+      ;; there are any articles in this group.
+      (nnml-possibly-create-directory group)
+      (nnml-possibly-change-directory group)
+      (unless nnml-article-file-alist
+       (setq nnml-article-file-alist
+             (sort
+              (nnheader-article-to-file-alist nnml-current-directory)
+              (lambda (a1 a2) (< (car a1) (car a2))))))
+      (setq active
+           (if nnml-article-file-alist
+               (cons (caar nnml-article-file-alist)
+                     (caar (last nnml-article-file-alist)))
+             (cons 1 0)))
+      (push (list group active) nnml-group-alist))

     (setcdr active (1+ (cdr active)))
     (while (file-exists-p
            (concat (nnmail-group-pathname group nnml-directory)
     (setcdr active (1+ (cdr active)))
     (while (file-exists-p
            (concat (nnmail-group-pathname group nnml-directory)


@@ -618,81 +620,45 @@ all. This may very well take some time.")
       (setcdr active (1+ (cdr active))))
     (cdr active)))
 
       (setcdr active (1+ (cdr active))))
     (cdr active)))
 

-(defun nnml-add-nov (group article line)
+(defun nnml-add-nov (group article headers)

   "Add a nov line for the GROUP base."
   "Add a nov line for the GROUP base."

-  (save-excursion 
+  (save-excursion

     (set-buffer (nnml-open-nov group))
     (goto-char (point-max))
     (set-buffer (nnml-open-nov group))
     (goto-char (point-max))

-    (insert (int-to-string article) line)))
+    (mail-header-set-number headers article)
+    (nnheader-insert-nov headers)))

 
 (defsubst nnml-header-value ()
   (buffer-substring (match-end 0) (progn (end-of-line) (point))))
 
 
 (defsubst nnml-header-value ()
   (buffer-substring (match-end 0) (progn (end-of-line) (point))))
 

-(defun nnml-make-nov-line (chars)
-  "Create a nov from the current headers."
-  (let ((case-fold-search t)
-       subject from date id references lines xref in-reply-to char)
-    (save-excursion
-      (save-restriction
-       (goto-char (point-min))
-       (narrow-to-region 
-        (point)
-        (1- (or (search-forward "\n\n" nil t) (point-max))))
-       ;; Fold continuation lines.
-       (goto-char (point-min))
-       (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
-         (replace-match " " t t))
-       (subst-char-in-region (point-min) (point-max) ?\t ? )
-       ;; [number subject from date id references chars lines xref]
-       (save-excursion
-         (goto-char (point-min))
-         (while (re-search-forward "^\\(from\\|subject\\|message-id\\|date\\|lines\\|xref\\|references\\|in-reply-to\\): "
-                                   nil t)
-           (beginning-of-line)
-           (setq char (downcase (following-char))) 
-           (cond
-            ((eq char ?s)
-             (setq subject (nnml-header-value)))
-            ((eq char ?f)
-             (setq from (nnml-header-value)))
-            ((eq char ?x)
-             (setq xref (buffer-substring (match-beginning 0) 
-                                          (progn (end-of-line) (point)))))
-            ((eq char ?l)
-             (setq lines (nnml-header-value)))
-            ((eq char ?d)
-             (setq date (nnml-header-value)))
-            ((eq char ?m)
-             (setq id (setq id (nnml-header-value))))
-            ((eq char ?r)
-             (setq references (nnml-header-value)))
-            ((eq char ?i)
-             (setq in-reply-to (nnml-header-value))))
-           (forward-line 1))
-      
-         (and (not references)
-              in-reply-to
-              (string-match "<[^>]+>" in-reply-to)
-              (setq references
-                    (substring in-reply-to (match-beginning 0)
-                               (match-end 0)))))
-       ;; [number subject from date id references chars lines xref]
-       (format "\t%s\t%s\t%s\t%s\t%s\t%d\t%s\t%s\t\n"
-               (or subject "(none)") (or from "(nobody)") (or date "")
-               (or id (nnmail-message-id))
-               (or references "") (or chars 0) (or lines "0") 
-               (or xref ""))))))
+(defun nnml-parse-head (chars &optional number)
+  "Parse the head of the current buffer."
+  (save-excursion
+    (save-restriction
+      (goto-char (point-min))
+      (narrow-to-region
+       (point)
+       (1- (or (search-forward "\n\n" nil t) (point-max))))
+      ;; Fold continuation lines.
+      (goto-char (point-min))
+      (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
+       (replace-match " " t t))
+      ;; Remove any tabs; they are too confusing.
+      (subst-char-in-region (point-min) (point-max) ?\t ? )
+      (let ((headers (nnheader-parse-head t)))
+       (mail-header-set-chars headers chars)
+       (mail-header-set-number headers number)
+       headers))))

 
 (defun nnml-open-nov (group)
   (or (cdr (assoc group nnml-nov-buffer-alist))
 
 (defun nnml-open-nov (group)
   (or (cdr (assoc group nnml-nov-buffer-alist))

-      (let ((buffer (find-file-noselect 
+      (let ((buffer (nnheader-find-file-noselect

                     (concat (nnmail-group-pathname group nnml-directory)
                             nnml-nov-file-name))))
        (save-excursion
          (set-buffer buffer)
          (buffer-disable-undo (current-buffer)))
                     (concat (nnmail-group-pathname group nnml-directory)
                             nnml-nov-file-name))))
        (save-excursion
          (set-buffer buffer)
          (buffer-disable-undo (current-buffer)))

-       (setq nnml-nov-buffer-alist 
-             (cons (cons group buffer) nnml-nov-buffer-alist))
+       (push (cons group buffer) nnml-nov-buffer-alist)

        buffer)))
 
 (defun nnml-save-nov ()
        buffer)))
 
 (defun nnml-save-nov ()


@@ -700,9 +666,8 @@ all. This may very well take some time.")
     (while nnml-nov-buffer-alist
       (when (buffer-name (cdar nnml-nov-buffer-alist))
        (set-buffer (cdar nnml-nov-buffer-alist))
     (while nnml-nov-buffer-alist
       (when (buffer-name (cdar nnml-nov-buffer-alist))
        (set-buffer (cdar nnml-nov-buffer-alist))

-       (and (buffer-modified-p)
-            (write-region 
-             1 (point-max) (buffer-file-name) nil 'nomesg))
+       (when (buffer-modified-p)
+         (nnmail-write-region 1 (point-max) (buffer-file-name) nil 'nomesg))

        (set-buffer-modified-p nil)
        (kill-buffer (current-buffer)))
       (setq nnml-nov-buffer-alist (cdr nnml-nov-buffer-alist)))))
        (set-buffer-modified-p nil)
        (kill-buffer (current-buffer)))
       (setq nnml-nov-buffer-alist (cdr nnml-nov-buffer-alist)))))


@@ -711,55 +676,55 @@ all. This may very well take some time.")
 (defun nnml-generate-nov-databases ()
   "Generate nov databases in all nnml directories."
   (interactive)
 (defun nnml-generate-nov-databases ()
   "Generate nov databases in all nnml directories."
   (interactive)

-  ;; Read the active file to make sure we don't re-use articles 
+  ;; Read the active file to make sure we don't re-use articles

   ;; numbers in empty groups.
   (nnmail-activate 'nnml)
   ;; numbers in empty groups.
   (nnmail-activate 'nnml)

-  (nnml-open-server (or nnml-current-server ""))
+  (nnml-open-server (or (nnoo-current-server 'nnml) ""))

   (setq nnml-directory (expand-file-name nnml-directory))
   ;; Recurse down the directories.
   (nnml-generate-nov-databases-1 nnml-directory)
   ;; Save the active file.
   (nnmail-save-active nnml-group-alist nnml-active-file))
 
   (setq nnml-directory (expand-file-name nnml-directory))
   ;; Recurse down the directories.
   (nnml-generate-nov-databases-1 nnml-directory)
   ;; Save the active file.
   (nnmail-save-active nnml-group-alist nnml-active-file))
 

-(defun nnml-generate-nov-databases-1 (dir)
+(defun nnml-generate-nov-databases-1 (dir &optional seen)

   (setq dir (file-name-as-directory dir))
   (setq dir (file-name-as-directory dir))

-  ;; We descend recursively 
-  (let ((dirs (directory-files dir t nil t))
-       dir)
-    (while dirs 
-      (setq dir (pop dirs))
-      (when (and (not (string-match "/\\.\\.?$" dir))
-                (file-directory-p dir))
-       (nnml-generate-nov-databases-1 dir))))
-  ;; Do this directory.
-  (let ((files (sort
-               (mapcar
-                (lambda (name) (string-to-int name))
-                (directory-files dir nil "^[0-9]+$" t))
-               '<)))
-    (when files
-      (funcall nnml-generate-active-function dir)
-      ;; Generate the nov file.
-      (nnml-generate-nov-file dir files))))
-
+  ;; Only scan this sub-tree if we haven't been here yet.
+  (unless (member (file-truename dir) seen)
+    (push (file-truename dir) seen)
+    ;; We descend recursively
+    (let ((dirs (directory-files dir t nil t))
+         dir)
+      (while (setq dir (pop dirs))
+       (when (and (not (member (file-name-nondirectory dir) '("." "..")))
+                  (file-directory-p dir))
+         (nnml-generate-nov-databases-1 dir seen))))
+    ;; Do this directory.
+    (let ((files (sort (nnheader-article-to-file-alist dir)
+                      (lambda (a b) (< (car a) (car b))))))
+      (when files
+       (funcall nnml-generate-active-function dir)
+       ;; Generate the nov file.
+       (nnml-generate-nov-file dir files)))))
+
+(defvar files)

 (defun nnml-generate-active-info (dir)
   ;; Update the active info for this group.
 (defun nnml-generate-active-info (dir)
   ;; Update the active info for this group.

-  (let ((group (nnheader-file-to-group 
+  (let ((group (nnheader-file-to-group

                (directory-file-name dir) nnml-directory)))
     (setq nnml-group-alist
          (delq (assoc group nnml-group-alist) nnml-group-alist))
     (push (list group
                (directory-file-name dir) nnml-directory)))
     (setq nnml-group-alist
          (delq (assoc group nnml-group-alist) nnml-group-alist))
     (push (list group

-               (cons (car files)
+               (cons (caar files)

                      (let ((f files))
                        (while (cdr f) (setq f (cdr f)))
                      (let ((f files))
                        (while (cdr f) (setq f (cdr f)))

-                       (car f))))
+                       (caar f))))

          nnml-group-alist)))
 
 (defun nnml-generate-nov-file (dir files)
   (let* ((dir (file-name-as-directory dir))
         (nov (concat dir nnml-nov-file-name))
         (nov-buffer (get-buffer-create " *nov*"))
          nnml-group-alist)))
 
 (defun nnml-generate-nov-file (dir files)
   (let* ((dir (file-name-as-directory dir))
         (nov (concat dir nnml-nov-file-name))
         (nov-buffer (get-buffer-create " *nov*"))

-        nov-line chars file)
+        chars file headers)

     (save-excursion
       ;; Init the nov buffer.
       (set-buffer nov-buffer)
     (save-excursion
       ;; Init the nov buffer.
       (set-buffer nov-buffer)


@@ -770,11 +735,10 @@ all. This may very well take some time.")
       (when (file-exists-p nov)
        (funcall nnmail-delete-file-function nov))
       (while files
       (when (file-exists-p nov)
        (funcall nnmail-delete-file-function nov))
       (while files

-       (unless (file-directory-p 
-                (setq file (concat dir (int-to-string (car files)))))
+       (unless (file-directory-p (setq file (concat dir (cdar files))))

          (erase-buffer)
          (erase-buffer)

-         (insert-file-contents file)
-         (narrow-to-region 
+         (nnheader-insert-file-contents file)
+         (narrow-to-region

           (goto-char (point-min))
           (progn
             (search-forward "\n\n" nil t)
           (goto-char (point-min))
           (progn
             (search-forward "\n\n" nil t)


@@ -783,27 +747,39 @@ all. This may very well take some time.")
          (when (and (not (= 0 chars))  ; none of them empty files...
                     (not (= (point-min) (point-max))))
            (goto-char (point-min))
          (when (and (not (= 0 chars))  ; none of them empty files...
                     (not (= (point-min) (point-max))))
            (goto-char (point-min))

-           (setq nov-line (nnml-make-nov-line chars))
+           (setq headers (nnml-parse-head chars (caar files)))

            (save-excursion
              (set-buffer nov-buffer)
              (goto-char (point-max))
            (save-excursion
              (set-buffer nov-buffer)
              (goto-char (point-max))

-             (insert (int-to-string (car files)) nov-line)))
+             (nnheader-insert-nov headers)))

          (widen))
        (setq files (cdr files)))
       (save-excursion
        (set-buffer nov-buffer)
          (widen))
        (setq files (cdr files)))
       (save-excursion
        (set-buffer nov-buffer)

-       (write-region 1 (point-max) (expand-file-name nov) nil
-                     'nomesg)
+       (nnmail-write-region 1 (point-max) nov nil 'nomesg)

        (kill-buffer (current-buffer))))))
 
 (defun nnml-nov-delete-article (group article)
   (save-excursion
     (set-buffer (nnml-open-nov group))
        (kill-buffer (current-buffer))))))
 
 (defun nnml-nov-delete-article (group article)
   (save-excursion
     (set-buffer (nnml-open-nov group))

-    (goto-char (point-min))
-    (if (re-search-forward (concat "^" (int-to-string article) "\t") nil t)
-       (delete-region (match-beginning 0) (progn (forward-line 1) (point))))
+    (when (nnheader-find-nov-line article)
+      (delete-region (point) (progn (forward-line 1) (point)))
+      (when (bobp)
+       (let ((active (cadr (assoc group nnml-group-alist)))
+             num)
+         (when active
+           (if (eobp)
+               (setf (car active) (1+ (cdr active)))
+             (when (and (setq num (ignore-errors (read (current-buffer))))
+                        (numberp num))
+               (setf (car active) num)))))))

     t))
 
     t))
 

+(defun nnml-update-file-alist ()
+  (unless nnml-article-file-alist
+    (setq nnml-article-file-alist
+         (nnheader-article-to-file-alist nnml-current-directory))))
+

 (provide 'nnml)
 
 ;;; nnml.el ends here
 (provide 'nnml)
 
 ;;; nnml.el ends here