(defvoo nnfolder-directory (expand-file-name message-directory)
"The name of the nnfolder directory.")
-(defvoo nnfolder-active-file
+(defvoo nnfolder-active-file
(nnheader-concat nnfolder-directory "active")
"The name of the active file.")
(defvoo nnfolder-ignore-active-file nil
"If non-nil, causes nnfolder to do some extra work in order to determine
the true active ranges of an mbox file. Note that the active file is still
-saved, but it's values are not used. This costs some extra time when
+saved, but it's values are not used. This costs some extra time when
scanning an mbox when opening it.")
(defvoo nnfolder-distrust-mbox nil
When nil, scans occur forward from the last marked message, a huge
time saver for large mailboxes.")
-(defvoo nnfolder-newsgroups-file
+(defvoo nnfolder-newsgroups-file
(concat (file-name-as-directory nnfolder-directory) "newsgroups")
"Mail newsgroups description file.")
(nnoo-change-server 'nnfolder server defs)
(nnmail-activate 'nnfolder t)
(gnus-make-directory nnfolder-directory)
- (cond
+ (cond
((not (file-exists-p nnfolder-directory))
(nnfolder-close-server)
(nnheader-report 'nnfolder "Couldn't create directory: %s"
(goto-char (point-min))
(search-forward (concat "\n" nnfolder-article-marker))
(cons nnfolder-current-group
- (string-to-int
- (buffer-substring
+ (string-to-int
+ (buffer-substring
(point) (progn (end-of-line) (point)))))))))))
(deffoo nnfolder-request-group (group &optional server dont-check)
(if (not (assoc group nnfolder-group-alist))
(nnheader-report 'nnfolder "No such group: %s" group)
(if dont-check
- (progn
+ (progn
(nnheader-report 'nnfolder "Selected group %s" group)
t)
(let* ((active (assoc group nnfolder-group-alist))
(group (car active))
(range (cadr active)))
- (cond
+ (cond
((null active)
(nnheader-report 'nnfolder "No such group: %s" group))
((null nnfolder-current-group)
(nnheader-report 'nnfolder "Empty group: %s" group))
(t
(nnheader-report 'nnfolder "Selected group %s" group)
- (nnheader-insert "211 %d %d %d %s\n"
+ (nnheader-insert "211 %d %d %d %s\n"
(1+ (- (cdr range) (car range)))
(car range) (cdr range) group))))))))
(deffoo nnfolder-request-scan (&optional group server)
(nnfolder-possibly-change-group group server t)
(nnmail-get-new-mail
- 'nnfolder
+ 'nnfolder
(lambda ()
(let ((bufs nnfolder-buffer-alist))
(save-excursion
(while bufs
(if (not (buffer-name (nth 1 (car bufs))))
- (setq nnfolder-buffer-alist
+ (setq nnfolder-buffer-alist
(delq (car bufs) nnfolder-buffer-alist))
(set-buffer (nth 1 (car bufs)))
(nnfolder-save-buffer)
(deffoo nnfolder-request-create-group (group &optional server args)
(nnfolder-possibly-change-group nil server)
(nnmail-activate 'nnfolder)
- (when group
+ (when group
(unless (assoc group nnfolder-group-alist)
(push (list group (cons 1 0)) nnfolder-group-alist)
(nnmail-save-active nnfolder-group-alist nnfolder-active-file)))
(save-excursion
(nnmail-find-file nnfolder-newsgroups-file)))
-(deffoo nnfolder-request-expire-articles
+(deffoo nnfolder-request-expire-articles
(articles newsgroup &optional server force)
(nnfolder-possibly-change-group newsgroup server)
(let* ((is-old t)
rest)
(nnmail-activate 'nnfolder)
- (save-excursion
+ (save-excursion
(set-buffer nnfolder-current-buffer)
(while (and articles is-old)
(goto-char (point-min))
(when (search-forward (nnfolder-article-string (car articles)) nil t)
(if (setq is-old
- (nnmail-expired-article-p
+ (nnmail-expired-article-p
newsgroup
- (buffer-substring
+ (buffer-substring
(point) (progn (end-of-line) (point)))
force nnfolder-inhibit-expiry))
(progn
- (nnheader-message 5 "Deleting article %d..."
+ (nnheader-message 5 "Deleting article %d..."
(car articles) newsgroup)
(nnfolder-delete-mail))
(push (car articles) rest)))
(article group server accept-form &optional last)
(let ((buf (get-buffer-create " *nnfolder move*"))
result)
- (and
+ (and
(nnfolder-request-article article group server)
(save-excursion
(set-buffer buf)
(erase-buffer)
(insert-buffer-substring nntp-server-buffer)
(goto-char (point-min))
- (while (re-search-forward
+ (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))
(nnfolder-possibly-change-group group server)
(nnmail-check-syntax)
(let ((buf (current-buffer))
- result)
+ result art-group)
(goto-char (point-min))
(when (looking-at "X-From-Line: ")
(replace-match "From "))
- (and
+ (and
(nnfolder-request-list)
(save-excursion
(set-buffer buf)
(car (nnfolder-save-mail
(if (stringp group)
(list (cons group (nnfolder-active-number group)))
- (nnmail-article-group 'nnfolder-active-number))))))
+ (setq art-group
+ (nnmail-article-group 'nnfolder-active-number)))))))
(when last
(save-excursion
- (nnfolder-possibly-change-folder group)
+ (nnfolder-possibly-change-folder (or (caar art-group) group))
(nnfolder-save-buffer)
(nnmail-cache-close))))
(nnmail-save-active nnfolder-group-alist nnfolder-active-file)
(ignore-errors
(delete-file (nnfolder-group-pathname group))))
;; Remove the group from all structures.
- (setq nnfolder-group-alist
+ (setq nnfolder-group-alist
(delq (assoc group nnfolder-group-alist) nnfolder-group-alist)
nnfolder-current-group nil
nnfolder-current-buffer nil)
(set-buffer nnfolder-current-buffer)
(and (file-writable-p buffer-file-name)
(ignore-errors
- (rename-file
+ (rename-file
buffer-file-name
(nnfolder-group-pathname new-name))
t)
;; The group doesn't exist, so we create a new entry for it.
(push (list group (cons 1 0)) nnfolder-group-alist)
(nnmail-save-active nnfolder-group-alist nnfolder-active-file))
-
+
(let (inf file)
;; If we have to change groups, see if we don't already have the
;; folder in memory. If we do, verify the modtime and destroy
nnfolder-current-buffer nil))
(setq nnfolder-current-group group)
-
+
(when (or (not nnfolder-current-buffer)
(not (verify-visited-file-modtime nnfolder-current-buffer)))
(save-excursion
;; The From line may have been quoted by movemail.
(when (looking-at (concat ">" message-unix-mail-delimiter))
(delete-char 1))
- ;; This might come from somewhere else.
+ ;; This might come from somewhere else.
(unless (looking-at message-unix-mail-delimiter)
(insert "From nobody " (current-time-string) "\n")
(goto-char (point-min)))
(setq start (marker-position end))
(goto-char end)
;; There may be more than one "From " line, so we skip past
- ;; them.
+ ;; them.
(while (looking-at delim)
(forward-line 1))
(set-marker end (if (nnmail-search-unix-mail-delim)
file)
(while (setq file (pop files))
(when (and (not (backup-file-name-p file))
- (nnheader-mail-file-mbox-p
+ (message-mail-file-mbox-p
(concat nnfolder-directory file)))
(nnheader-message 5 "Adding group %s..." file)
(push (list file (cons 1 0)) nnfolder-group-alist)
"Make pathname for GROUP."
(let ((dir (file-name-as-directory (expand-file-name nnfolder-directory))))
;; If this file exists, we use it directly.
- (if (or nnmail-use-long-file-names
+ (if (or nnmail-use-long-file-names
(file-exists-p (concat dir group)))
(concat dir group)
;; If not, we translate dots into slashes.