;;; nnfolder.el --- mail folder access for Gnus
-;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
;; Author: Scott Byer <byer@mv.us.adobe.com>
;; Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
(save-excursion
(set-buffer nntp-server-buffer)
(erase-buffer)
- (let (article art-string start stop)
+ (let (article start stop)
(nnfolder-possibly-change-group group server)
(when nnfolder-current-buffer
(set-buffer nnfolder-current-buffer)
(goto-char (point-min))
(if (stringp (car articles))
'headers
- (while articles
- (setq article (car articles))
- (setq art-string (nnfolder-article-string article))
+ (while (setq article (pop articles))
(set-buffer nnfolder-current-buffer)
- (when (or (search-forward art-string nil t)
- ;; Don't search the whole file twice! Also, articles
- ;; probably have some locality by number, so searching
- ;; backwards will be faster. Especially if we're at the
- ;; beginning of the buffer :-). -SLB
- (search-backward art-string nil t))
- (nnmail-search-unix-mail-delim-backward)
+ (when (nnfolder-goto-article article)
(setq start (point))
(search-forward "\n\n" nil t)
(setq stop (1- (point)))
(insert (format "221 %d Article retrieved.\n" article))
(insert-buffer-substring nnfolder-current-buffer start stop)
(goto-char (point-max))
- (insert ".\n"))
- (setq articles (cdr articles)))
+ (insert ".\n")))
(set-buffer nntp-server-buffer)
(nnheader-fold-continuation-lines)
(save-excursion
(set-buffer nnfolder-current-buffer)
(goto-char (point-min))
- (when (search-forward (nnfolder-article-string article) nil t)
+ (when (nnfolder-goto-article article)
(let (start stop)
- (nnmail-search-unix-mail-delim-backward)
(setq start (point))
(forward-line 1)
(unless (and (nnmail-search-unix-mail-delim)
(set-buffer nnfolder-current-buffer)
(while (and articles is-old)
(goto-char (point-min))
- (when (search-forward (nnfolder-article-string (car articles)) nil t)
+ (when (nnfolder-goto-article (car articles))
(if (setq is-old
(nnmail-expired-article-p
newsgroup
(nnmail-save-active nnfolder-group-alist nnfolder-active-file)
(nconc rest articles))))
-(deffoo nnfolder-request-move-article
- (article group server accept-form &optional last)
- (let ((buf (get-buffer-create " *nnfolder move*"))
- result)
- (and
- (nnfolder-request-article article group server)
- (save-excursion
- (set-buffer buf)
- (buffer-disable-undo (current-buffer))
- (erase-buffer)
- (insert-buffer-substring nntp-server-buffer)
- (goto-char (point-min))
- (while (re-search-forward
- (concat "^" nnfolder-article-marker)
- (save-excursion (search-forward "\n\n" nil t) (point)) t)
- (delete-region (progn (beginning-of-line) (point))
- (progn (forward-line 1) (point))))
- (setq result (eval accept-form))
- (kill-buffer buf)
- result)
- (save-excursion
- (nnfolder-possibly-change-group group server)
- (set-buffer nnfolder-current-buffer)
- (goto-char (point-min))
- (when (search-forward (nnfolder-article-string article) nil t)
- (nnfolder-delete-mail))
- (when last
- (nnfolder-save-buffer)
- (nnfolder-adjust-min-active group)
- (nnmail-save-active nnfolder-group-alist nnfolder-active-file))))
- result))
+(deffoo nnfolder-request-move-article (article group server
+ accept-form &optional last)
+ (save-excursion
+ (let ((buf (get-buffer-create " *nnfolder move*"))
+ result)
+ (and
+ (nnfolder-request-article article group server)
+ (save-excursion
+ (set-buffer buf)
+ (buffer-disable-undo (current-buffer))
+ (erase-buffer)
+ (insert-buffer-substring nntp-server-buffer)
+ (goto-char (point-min))
+ (while (re-search-forward
+ (concat "^" nnfolder-article-marker)
+ (save-excursion (search-forward "\n\n" nil t) (point)) t)
+ (delete-region (progn (beginning-of-line) (point))
+ (progn (forward-line 1) (point))))
+ (setq result (eval accept-form))
+ (kill-buffer buf)
+ result)
+ (save-excursion
+ (nnfolder-possibly-change-group group server)
+ (set-buffer nnfolder-current-buffer)
+ (goto-char (point-min))
+ (when (nnfolder-goto-article article)
+ (nnfolder-delete-mail))
+ (when last
+ (nnfolder-save-buffer)
+ (nnfolder-adjust-min-active group)
+ (nnmail-save-active nnfolder-group-alist nnfolder-active-file))))
+ result)))
(deffoo nnfolder-request-accept-article (group &optional server last)
- (nnfolder-possibly-change-group group server)
- (nnmail-check-syntax)
- (let ((buf (current-buffer))
- result art-group)
- (goto-char (point-min))
- (when (looking-at "X-From-Line: ")
- (replace-match "From "))
- (and
- (nnfolder-request-list)
- (save-excursion
- (set-buffer buf)
- (goto-char (point-min))
- (search-forward "\n\n" nil t)
- (forward-line -1)
- (while (re-search-backward (concat "^" nnfolder-article-marker) nil t)
- (delete-region (point) (progn (forward-line 1) (point))))
- (when nnmail-cache-accepted-message-ids
- (nnmail-cache-insert (nnmail-fetch-field "message-id")))
- (setq result (if (stringp group)
- (list (cons group (nnfolder-active-number group)))
- (setq art-group
- (nnmail-article-group 'nnfolder-active-number))))
- (if (and (null result)
- (yes-or-no-p "Moved to `junk' group; delete article? "))
- (setq result 'junk)
- (setq result
- (car (nnfolder-save-mail result)))))
- (when last
+ (save-excursion
+ (nnfolder-possibly-change-group group server)
+ (nnmail-check-syntax)
+ (let ((buf (current-buffer))
+ result art-group)
+ (goto-char (point-min))
+ (when (looking-at "X-From-Line: ")
+ (replace-match "From "))
+ (and
+ (nnfolder-request-list)
(save-excursion
- (nnfolder-possibly-change-folder (or (caar art-group) group))
- (nnfolder-save-buffer)
+ (set-buffer buf)
+ (goto-char (point-min))
+ (search-forward "\n\n" nil t)
+ (forward-line -1)
+ (while (re-search-backward (concat "^" nnfolder-article-marker) nil t)
+ (delete-region (point) (progn (forward-line 1) (point))))
(when nnmail-cache-accepted-message-ids
- (nnmail-cache-close)))))
- (nnmail-save-active nnfolder-group-alist nnfolder-active-file)
- (unless result
- (nnheader-report 'nnfolder "Couldn't store article"))
- result))
+ (nnmail-cache-insert (nnmail-fetch-field "message-id")))
+ (setq result (if (stringp group)
+ (list (cons group (nnfolder-active-number group)))
+ (setq art-group
+ (nnmail-article-group 'nnfolder-active-number))))
+ (if (and (null result)
+ (yes-or-no-p "Moved to `junk' group; delete article? "))
+ (setq result 'junk)
+ (setq result
+ (car (nnfolder-save-mail result)))))
+ (when last
+ (save-excursion
+ (nnfolder-possibly-change-folder (or (caar art-group) group))
+ (nnfolder-save-buffer)
+ (when nnmail-cache-accepted-message-ids
+ (nnmail-cache-close)))))
+ (nnmail-save-active nnfolder-group-alist nnfolder-active-file)
+ (unless result
+ (nnheader-report 'nnfolder "Couldn't store article"))
+ result)))
(deffoo nnfolder-request-replace-article (article group buffer)
(nnfolder-possibly-change-group group)
(nnfolder-normalize-buffer)
(set-buffer nnfolder-current-buffer)
(goto-char (point-min))
- (if (not (search-forward (nnfolder-article-string article) nil t))
+ (if (not (nnfolder-goto-article article))
nil
(nnfolder-delete-mail t t)
(insert-buffer-substring buffer)
(concat "\n" nnfolder-article-marker (int-to-string article) " ")
(concat "\nMessage-ID: " article)))
+(defun nnfolder-goto-article (article)
+ "Place point at the start of the headers of ARTICLE.
+ARTICLE can be an article number or a Message-ID."
+ (let ((art-string (nnfolder-article-string article))
+ end-search end start beg)
+ (beginning-of-line)
+ (unless (bobp)
+ (forward-char -1))
+ (setq start (point))
+ (while (and (not end-search)
+ (search-forward art-string nil t))
+ (setq end (point))
+ (nnmail-search-unix-mail-delim-backward)
+ (setq beg (point))
+ (when (and (search-forward "\n\n" nil end)
+ (search-backward art-string nil beg))
+ (setq end-search 'found)
+ (goto-char beg)))
+ (unless end-search
+ (goto-char start)
+ (while (and (not end-search)
+ (search-backward art-string nil t))
+ (setq end (point))
+ (nnmail-search-unix-mail-delim-backward)
+ (setq beg (point))
+ (when (and (search-forward "\n\n" nil end)
+ (search-backward art-string nil beg))
+ (setq end-search 'found)
+ (goto-char beg))))
+ (eq end-search 'found)))
+
(defun nnfolder-delete-mail (&optional force leave-delim)
"Delete the message that point is in."
(save-excursion
(setq nnfolder-current-group group)
(when (or (not nnfolder-current-buffer)
- (not (verify-visited-file-modtime nnfolder-current-buffer)))
+ (not (verify-visited-file-modtime
+ nnfolder-current-buffer)))
(save-excursion
(setq file (nnfolder-group-pathname group))
;; See whether we need to create the new file.