;;; 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>
;; 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:
(defvoo nnml-directory message-directory
"Mail spool directory.")
-(defvoo nnml-active-file
+(defvoo nnml-active-file
(concat (file-name-as-directory nnml-directory) "active")
"Mail active file.")
-(defvoo nnml-newsgroups-file
+(defvoo nnml-newsgroups-file
(concat (file-name-as-directory nnml-directory) "newsgroups")
"Mail newsgroups description file.")
(nnoo-define-basics nnml)
-(deffoo 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 server)
- (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))
+(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))))
+
(and (numberp nnmail-large-newsgroup)
(> number nnmail-large-newsgroup)
- (zerop (% count 20))
- (nnheader-message 6 "nnml: Receiving headers... %d%%"
- (/ (* count 100) number))))
+ (nnheader-message 6 "nnml: Receiving headers...done"))
- (and (numberp nnmail-large-newsgroup)
- (> number nnmail-large-newsgroup)
- (nnheader-message 6 "nnml: Receiving headers...done"))
-
- (nnheader-fold-continuation-lines)
- 'headers)))))
+ (nnheader-fold-continuation-lines)
+ 'headers))))))
(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)
- (error t)))
- (cond
+ (error)))
+ (cond
((not (file-exists-p nnml-directory))
(nnml-close-server)
(nnheader-report 'nnml "Couldn't create directory: %s" nnml-directory))
server nnml-directory)
t)))
-(deffoo nnml-request-article (id &optional newsgroup server buffer)
- (nnml-possibly-change-directory newsgroup server)
+(defun nnml-request-regenerate (server)
+ (nnml-possibly-change-directory nil server)
+ (nnml-generate-nov-databases)
+ t)
+
+(deffoo nnml-request-article (id &optional group server buffer)
+ (nnml-possibly-change-directory group server)
(let* ((nntp-server-buffer (or buffer nntp-server-buffer))
path gpath group-num)
(if (stringp id)
(when (and (setq group-num (nnml-find-group-number id))
(cdr
- (assq (cdr group-num)
+ (assq (cdr group-num)
(nnheader-article-to-file-alist
(setq gpath
(nnmail-group-pathname
- (car group-num)
+ (car group-num)
nnml-directory))))))
(setq path (concat gpath (int-to-string (cdr group-num)))))
(setq path (nnml-article-to-file id)))
- (cond
+ (cond
((not path)
(nnheader-report 'nnml "No such article: %s" id))
((not (file-exists-p path))
(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)))))))
(deffoo nnml-request-group (group &optional server dont-check)
- (cond
+ (cond
((not (nnml-possibly-change-directory group server))
(nnheader-report 'nnml "Invalid group (no such directory)"))
((not (file-exists-p nnml-current-directory))
nnml-current-directory))
((not (file-directory-p nnml-current-directory))
(nnheader-report 'nnml "%s is not a directory" nnml-current-directory))
- (dont-check
+ (dont-check
(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)
- (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))))))
(deffoo nnml-request-scan (&optional group server)
(setq nnml-article-file-alist nil)
+ (nnml-possibly-change-directory group server)
(nnmail-get-new-mail 'nnml 'nnml-save-nov nnml-directory group))
(deffoo nnml-close-group (group &optional server)
(setq nnml-article-file-alist nil)
t)
-(deffoo nnml-request-create-group (group &optional server args)
+(deffoo nnml-request-create-group (group &optional server args)
(nnmail-activate 'nnml)
(unless (assoc group nnml-group-alist)
(let (active)
(deffoo nnml-request-list (&optional server)
(save-excursion
(nnmail-find-file nnml-active-file)
- (setq nnml-group-alist (nnmail-get-active))))
+ (setq nnml-group-alist (nnmail-get-active))
+ t))
(deffoo nnml-request-newgroups (date &optional server)
(nnml-request-list server))
(save-excursion
(nnmail-find-file nnml-newsgroups-file)))
-(deffoo nnml-request-expire-articles (articles newsgroup &optional server force)
- (nnml-possibly-change-directory newsgroup server)
- (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)
- (unless nnml-article-file-alist
- (setq nnml-article-file-alist
- (nnheader-article-to-file-alist nnml-current-directory)))
-
(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
- nnml-inhibit-expiry)))
- (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)
- (message "")
(nconc rest articles)))
-(deffoo nnml-request-move-article
+(deffoo nnml-request-move-article
(article group server accept-form &optional last)
(let ((buf (get-buffer-create " *nnml move*"))
result)
(nnml-possibly-change-directory group server)
- (unless nnml-article-file-alist
- (setq nnml-article-file-alist
- (nnheader-article-to-file-alist nnml-current-directory)))
- (and
+ (nnml-update-file-alist)
+ (and
(nnml-deletable-article-p group article)
(nnml-request-article article group server)
(save-excursion
(nnml-possibly-change-directory group server)
(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)
- (and last (nnml-save-nov))))
+ (when last
+ (nnml-save-nov)
+ (nnmail-save-active nnml-group-alist nnml-active-file))))
result))
(deffoo nnml-request-accept-article (group &optional server last)
(nnml-possibly-change-directory group server)
(nnmail-check-syntax)
(let (result)
+ (nnmail-cache-insert (nnmail-fetch-field "message-id"))
(if (stringp group)
- (and
+ (and
(nnmail-activate 'nnml)
- (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)
(nnmail-activate 'nnml)
(setq result (car (nnml-save-mail
(nnmail-article-group 'nnml-active-number))))
- (progn
+ (when last
(nnmail-save-active nnml-group-alist nnml-active-file)
- (and last (nnml-save-nov)))))
+ (nnmail-cache-close)
+ (nnml-save-nov))))
result))
(deffoo nnml-request-replace-article (article group buffer)
headers)
(when (condition-case ()
(progn
- (nnmail-write-region
+ (nnmail-write-region
(point-min) (point-max)
- (concat nnml-current-directory
- (int-to-string article))
+ (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.
- (save-excursion
+ (save-excursion
(set-buffer (nnml-open-nov group))
(goto-char (point-min))
(if (or (looking-at art)
;; we should insert it. (This situation should never
;; 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)))))
(nnml-possibly-change-directory group server)
(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)
- (while articles
+ (while articles
(setq article (pop articles))
(when (file-writable-p article)
(nnheader-message 5 "Deleting article %s in %s..." article group)
(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)
;; One might be more clever, I guess.
(let ((files (nnheader-article-to-file-alist old-dir)))
(while files
- (rename-file
+ (rename-file
(concat old-dir (cdar files))
(concat new-dir (cdar files)))
(pop files)))
(error nil)))
;; That went ok, so we change the internal structures.
(let ((entry (assoc group nnml-group-alist)))
- (and entry (setcar entry new-name))
+ (when entry
+ (setcar entry new-name))
(setq nnml-current-directory nil
nnml-current-group nil)
;; Save the new group alist.
(nnheader-report 'nnml "File %s does not exist" file))
(t
(nnheader-temp-write file
- (nnheader-insert-file-contents-literally file)
+ (nnheader-insert-file-contents file)
(nnmail-replace-status name value))
t))))
;;; Internal functions.
(defun nnml-article-to-file (article)
- (unless nnml-article-file-alist
- (setq nnml-article-file-alist
- (nnheader-article-to-file-alist nnml-current-directory)))
+ (nnml-update-file-alist)
(let (file)
(when (setq file (cdr (assq article nnml-article-file-alist)))
(concat nnml-current-directory file))))
(defun nnml-deletable-article-p (group article)
"Say whether ARTICLE in GROUP can be deleted."
- (let (file path)
- (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)))))))
-
-;; Find an article number in the current group given the Message-ID.
+ (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*"))
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.
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.
- (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
- (let ((first (car articles))
- (last (progn (while (cdr articles) (setq articles (cdr articles)))
- (car articles)))
- (nov (concat nnml-current-directory nnml-nov-file-name)))
+ (let ((nov (concat nnml-current-directory nnml-nov-file-name)))
(when (file-exists-p nov)
(save-excursion
(set-buffer nntp-server-buffer)
(erase-buffer)
- (insert-file-contents nov)
+ (nnheader-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)))
+ (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))
- (when group
+ (if (not group)
+ t
(let ((pathname (nnmail-group-pathname group nnml-directory)))
(when (not (equal pathname nnml-current-directory))
(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))
- (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)))))
-
+
(defun nnml-save-mail (group-art)
"Called narrowed to an article."
(let (chars headers)
(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 ((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.
- (nnmail-write-region (point-min) (point-max) file nil
+ (nnmail-write-region (point-min) (point-max) file nil
(if (nnheader-be-verbose 5) nil 'nomesg))
(setq first file)))
(setq ga (cdr ga))))
;; Generate a nov line for this article. We generate the nov
;; line after saving, because nov generation destroys the
- ;; header.
+ ;; header.
(setq headers (nnml-parse-head chars))
;; Output the nov line to all nov databases that should have it.
(let ((ga group-art))
"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.
+ ;; entry for it.
(unless active
;; Perhaps the active file was corrupt? See whether
;; there are any articles in this group.
(cons (caar nnml-article-file-alist)
(caar (last nnml-article-file-alist)))
(cons 1 0)))
- (setq nnml-group-alist (cons (list group active) nnml-group-alist)))
+ (push (list group active) nnml-group-alist))
(setcdr active (1+ (cdr active)))
(while (file-exists-p
(concat (nnmail-group-pathname group nnml-directory)
(defun nnml-add-nov (group article headers)
"Add a nov line for the GROUP base."
- (save-excursion
+ (save-excursion
(set-buffer (nnml-open-nov group))
(goto-char (point-max))
(mail-header-set-number headers article)
(save-excursion
(save-restriction
(goto-char (point-min))
- (narrow-to-region
+ (narrow-to-region
(point)
(1- (or (search-forward "\n\n" nil t) (point-max))))
;; Fold continuation lines.
(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)))
- (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 ()
(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)
(nnml-open-server (or (nnoo-current-server 'nnml) ""))
;; 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))
- ;; We descend recursively
- (let ((dirs (directory-files dir t nil t))
- dir)
- (while dirs
- (setq dir (pop dirs))
- (when (and (not (member (file-name-nondirectory 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.
- (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
- (cons (car files)
+ (cons (caar files)
(let ((f files))
(while (cdr f) (setq f (cdr f)))
- (car f))))
+ (caar f))))
nnml-group-alist)))
(defun nnml-generate-nov-file (dir 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)
- (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)
(when (and (not (= 0 chars)) ; none of them empty files...
(not (= (point-min) (point-max))))
(goto-char (point-min))
- (setq headers (nnml-parse-head chars (car files)))
+ (setq headers (nnml-parse-head chars (caar files)))
(save-excursion
(set-buffer nov-buffer)
(goto-char (point-max))
(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))
+(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
projects / gnus / blobdiff