diff options
Diffstat (limited to 'lisp/gnus/nnfolder.el')
| -rw-r--r-- | lisp/gnus/nnfolder.el | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el index 867bd8dc20e..6334b1c998d 100644 --- a/lisp/gnus/nnfolder.el +++ b/lisp/gnus/nnfolder.el @@ -32,7 +32,6 @@ (require 'message) (require 'nnmail) (require 'nnoo) -(eval-when-compile (require 'cl)) (require 'gnus) (require 'gnus-util) (require 'gnus-range) @@ -329,8 +328,7 @@ all. This may very well take some time.") (delq inf nnfolder-buffer-alist)) (setq nnfolder-current-buffer (cadr inf) nnfolder-current-group (car inf)))) - (when (and nnfolder-current-buffer - (buffer-name nnfolder-current-buffer)) + (when (buffer-live-p nnfolder-current-buffer) (with-current-buffer nnfolder-current-buffer ;; If the buffer was modified, write the file out now. (nnfolder-save-buffer) @@ -863,7 +861,7 @@ deleted. Point is left where the deleted region was." (mm-enable-multibyte) ;; Use multibyte buffer for future copying. (buffer-disable-undo) (if (equal (cadr (assoc group nnfolder-scantime-alist)) - (nth 5 (file-attributes file))) + (file-attribute-modification-time (file-attributes file))) ;; This looks up-to-date, so we don't do any scanning. (if (file-exists-p file) buffer @@ -878,17 +876,17 @@ deleted. Point is left where the deleted region was." (delete-char 1)) (nnmail-activate 'nnfolder) ;; Read in the file. - (let ((delim "^From ") - (marker (concat "\n" nnfolder-article-marker)) - (number "[0-9]+") - (active (or (cadr (assoc group nnfolder-group-alist)) - (cons 1 0))) - (scantime (assoc group nnfolder-scantime-alist)) - (minid most-positive-fixnum) - maxid start end newscantime - novbuf articles newnum - buffer-read-only) - (setq maxid (cdr active)) + (let* ((delim "^From ") + (marker (concat "\n" nnfolder-article-marker)) + (number "[0-9]+") + (active (or (cadr (assoc group nnfolder-group-alist)) + (cons 1 0))) + (scantime (assoc group nnfolder-scantime-alist)) + (minid (cdr active)) + maxid start end newscantime + novbuf articles newnum + buffer-read-only) + (setq maxid minid) (unless (or gnus-nov-is-evil nnfolder-nov-is-evil (and (file-exists-p nov) @@ -959,7 +957,7 @@ deleted. Point is left where the deleted region was." (while (not (= end (point-max))) (setq start (marker-position end)) (goto-char end) - ;; There may be more than one "From " line, so we skip past + ;; There may be more than one "From " line, so we skip past ;; them. (while (looking-at delim) (forward-line 1)) @@ -1111,7 +1109,7 @@ This command does not work if you use short group names." (defun nnfolder-save-nov () (save-excursion (while nnfolder-nov-buffer-alist - (when (buffer-name (cdar nnfolder-nov-buffer-alist)) + (when (buffer-live-p (cdar nnfolder-nov-buffer-alist)) (set-buffer (cdar nnfolder-nov-buffer-alist)) (when (buffer-modified-p) (gnus-make-directory (file-name-directory @@ -1163,15 +1161,15 @@ This command does not work if you use short group names." (with-temp-buffer (insert-buffer-substring buf b e) (let ((headers (nnheader-parse-naked-head))) - (mail-header-set-chars headers chars) - (mail-header-set-number headers number) + (setf (mail-header-chars headers) chars) + (setf (mail-header-number headers) number) headers))))) (defun nnfolder-add-nov (group article headers) "Add a nov line for the GROUP base." (with-current-buffer (nnfolder-open-nov group) (goto-char (point-max)) - (mail-header-set-number headers article) + (setf (mail-header-number headers) article) (nnheader-insert-nov headers))) (provide 'nnfolder) |