[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/gnus/nnml.el [emacs-unicode-2]
|
From: |
Miles Bader |
|
Subject: |
[Emacs-diffs] Changes to emacs/lisp/gnus/nnml.el [emacs-unicode-2] |
|
Date: |
Thu, 09 Sep 2004 06:02:57 -0400 |
Index: emacs/lisp/gnus/nnml.el
diff -c emacs/lisp/gnus/nnml.el:1.10.6.1 emacs/lisp/gnus/nnml.el:1.10.6.2
*** emacs/lisp/gnus/nnml.el:1.10.6.1 Fri Mar 12 00:03:11 2004
--- emacs/lisp/gnus/nnml.el Thu Sep 9 09:36:26 2004
***************
*** 1,9 ****
;;; nnml.el --- mail spool access for Gnus
! ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
;; Free Software Foundation, Inc.
! ;; Author: Lars Magne Ingebrigtsen <address@hidden>
! ;; Masanobu UMEDA <address@hidden>
;; Keywords: news, mail
;; This file is part of GNU Emacs.
--- 1,10 ----
;;; nnml.el --- mail spool access for Gnus
! ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003
;; Free Software Foundation, Inc.
! ;; Author: Simon Josefsson <address@hidden> (adding MARKS)
! ;; Lars Magne Ingebrigtsen <address@hidden>
! ;; Masanobu UMEDA <address@hidden>
;; Keywords: news, mail
;; This file is part of GNU Emacs.
***************
*** 31,42 ****
;;; Code:
(require 'nnheader)
(require 'nnmail)
(require 'nnoo)
(eval-when-compile (require 'cl))
(eval-and-compile
! (autoload 'gnus-sorted-intersection "gnus-range"))
(nnoo-declare nnml)
--- 32,45 ----
;;; Code:
+ (require 'gnus)
(require 'nnheader)
(require 'nnmail)
(require 'nnoo)
(eval-when-compile (require 'cl))
+
(eval-and-compile
! (autoload 'gnus-article-unpropagatable-p "gnus-sum"))
(nnoo-declare nnml)
***************
*** 55,61 ****
"If non-nil, nnml will check the incoming mail file and split the mail.")
(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.
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
--- 58,64 ----
"If non-nil, nnml will check the incoming mail file and split the mail.")
(defvoo nnml-nov-is-evil nil
! "If non-nil, Gnus will never generate and use nov databases for mail spools.
Using nov databases will speed up header fetching considerably.
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
***************
*** 63,74 ****
--- 66,88 ----
through all nnml directories and generate nov databases for them
all. This may very well take some time.")
+ (defvoo nnml-marks-is-evil nil
+ "If non-nil, Gnus will never generate and use marks file for mail spools.
+ Using marks files makes it possible to backup and restore mail groups
+ separately from `.newsrc.eld'. If you have, for some reason, set this
+ to t, and want to set it to nil again, you should always remove the
+ corresponding marks file (usually named `.marks' in the nnml group
+ directory, but see `nnml-marks-file-name') for the group. Then the
+ marks file will be regenerated properly by Gnus.")
+
(defvoo nnml-prepare-save-mail-hook nil
"Hook run narrowed to an article before saving.")
(defvoo nnml-inhibit-expiry nil
"If non-nil, inhibit expiry.")
+ (defvoo nnml-use-compressed-files nil
+ "If non-nil, allow using compressed message files.")
***************
*** 76,81 ****
--- 90,96 ----
"nnml version.")
(defvoo nnml-nov-file-name ".overview")
+ (defvoo nnml-marks-file-name ".marks")
(defvoo nnml-current-directory nil)
(defvoo nnml-current-group nil)
***************
*** 91,98 ****
(defvoo nnml-file-coding-system nnmail-file-coding-system)
!
;;; Interface functions.
(nnoo-define-basics nnml)
--- 106,116 ----
(defvoo nnml-file-coding-system nnmail-file-coding-system)
! (defvoo nnml-marks nil)
+ (defvar nnml-marks-modtime (gnus-make-hashtable))
+
+
;;; Interface functions.
(nnoo-define-basics nnml)
***************
*** 102,112 ****
(save-excursion
(set-buffer nntp-server-buffer)
(erase-buffer)
! (let ((file nil)
! (number (length sequence))
! (count 0)
! (file-name-coding-system nnmail-pathname-coding-system)
! beg article)
(if (stringp (car sequence))
'headers
(if (nnml-retrieve-headers-with-nov sequence fetch-old)
--- 120,130 ----
(save-excursion
(set-buffer nntp-server-buffer)
(erase-buffer)
! (let* ((file nil)
! (number (length sequence))
! (count 0)
! (file-name-coding-system nnmail-pathname-coding-system)
! beg article)
(if (stringp (car sequence))
'headers
(if (nnml-retrieve-headers-with-nov sequence fetch-old)
***************
*** 121,127 ****
(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"))
--- 139,145 ----
(setq beg (point))
(nnheader-insert-head file)
(goto-char beg)
! (if (re-search-forward "\n\r?\n" nil t)
(forward-char -1)
(goto-char (point-max))
(insert "\n\n"))
***************
*** 158,166 ****
server nnml-directory)
t)))
! (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)
--- 176,184 ----
server nnml-directory)
t)))
! (deffoo nnml-request-regenerate (server)
(nnml-possibly-change-directory nil server)
! (nnml-generate-nov-databases server)
t)
(deffoo nnml-request-article (id &optional group server buffer)
***************
*** 245,251 ****
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))))
--- 263,269 ----
nnml-group-alist)
(nnml-possibly-create-directory group)
(nnml-possibly-change-directory group server)
! (let ((articles (nnml-directory-articles nnml-current-directory)))
(when articles
(setcar active (apply 'min articles))
(setcdr active (apply 'max articles))))
***************
*** 270,276 ****
(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)
--- 288,294 ----
(deffoo nnml-request-expire-articles (articles group &optional server force)
(nnml-possibly-change-directory group server)
(let ((active-articles
! (nnml-directory-articles nnml-current-directory))
(is-old t)
article rest mod-time number)
(nnmail-activate 'nnml)
***************
*** 281,310 ****
(setq articles (gnus-sorted-intersection articles active-articles))
(while (and articles is-old)
! (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
! ;; Allow a special target group.
! (unless (eq nnmail-expiry-target 'delete)
! (with-temp-buffer
! (nnml-request-article number group server
! (current-buffer))
! (let ((nnml-current-directory nil))
! (nnmail-expiry-target-group
! nnmail-expiry-target group))))
! (nnheader-message 5 "Deleting article %s in %s"
! number 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
--- 299,330 ----
(setq articles (gnus-sorted-intersection articles active-articles))
(while (and articles is-old)
! (if (and (setq article (nnml-article-to-file
! (setq number (pop articles))))
! (setq mod-time (nth 5 (file-attributes article)))
! (nnml-deletable-article-p group number)
! (setq is-old (nnmail-expired-article-p group mod-time force
! nnml-inhibit-expiry)))
! (progn
! ;; Allow a special target group.
! (unless (eq nnmail-expiry-target 'delete)
! (with-temp-buffer
! (nnml-request-article number group server (current-buffer))
! (let (nnml-current-directory
! nnml-current-group
! nnml-article-file-alist)
! (nnmail-expiry-target-group nnmail-expiry-target group)))
! ;; Maybe directory is changed during nnmail-expiry-target-group.
! (nnml-possibly-change-directory group server))
! (nnheader-message 5 "Deleting article %s in %s"
! number 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
***************
*** 349,355 ****
(nnmail-check-syntax)
(let (result)
(when nnmail-cache-accepted-message-ids
! (nnmail-cache-insert (nnmail-fetch-field "message-id")))
(if (stringp group)
(and
(nnmail-activate 'nnml)
--- 369,378 ----
(nnmail-check-syntax)
(let (result)
(when nnmail-cache-accepted-message-ids
! (nnmail-cache-insert (nnmail-fetch-field "message-id")
! group
! (nnmail-fetch-field "subject")
! (nnmail-fetch-field "from")))
(if (stringp group)
(and
(nnmail-activate 'nnml)
***************
*** 371,376 ****
--- 394,402 ----
(nnml-save-nov))))
result))
+ (deffoo nnml-request-post (&optional server)
+ (nnmail-do-request-post 'nnml-request-accept-article server))
+
(deffoo nnml-request-replace-article (article group buffer)
(nnml-possibly-change-directory group)
(save-excursion
***************
*** 395,402 ****
(if (or (looking-at art)
(search-forward (concat "\n" art) nil t))
;; Delete the old NOV line.
! (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
;; occur, but one likes to make sure...)
--- 421,427 ----
(if (or (looking-at art)
(search-forward (concat "\n" art) nil t))
;; Delete the old NOV line.
! (gnus-delete-line)
;; The line isn't here, so we have to find out where
;; we should insert it. (This situation should never
;; occur, but one likes to make sure...)
***************
*** 419,425 ****
(directory-files
nnml-current-directory t
(concat nnheader-numerical-short-files
! "\\|" (regexp-quote nnml-nov-file-name) "$")))
article)
(while articles
(setq article (pop articles))
--- 444,451 ----
(directory-files
nnml-current-directory t
(concat nnheader-numerical-short-files
! "\\|" (regexp-quote nnml-nov-file-name) "$"
! "\\|" (regexp-quote nnml-marks-file-name) "$")))
article)
(while articles
(setq article (pop articles))
***************
*** 457,462 ****
--- 483,492 ----
(let ((overview (concat old-dir nnml-nov-file-name)))
(when (file-exists-p overview)
(rename-file overview (concat new-dir nnml-nov-file-name))))
+ ;; Move .marks file.
+ (let ((marks (concat old-dir nnml-marks-file-name)))
+ (when (file-exists-p marks)
+ (rename-file marks (concat new-dir nnml-marks-file-name))))
(when (<= (length (directory-files old-dir)) 2)
(ignore-errors (delete-directory old-dir)))
;; That went ok, so we change the internal structures.
***************
*** 487,501 ****
(defun nnml-article-to-file (article)
(nnml-update-file-alist)
(let (file)
! (if (setq file (cdr (assq article nnml-article-file-alist)))
(expand-file-name file nnml-current-directory)
! ;; Just to make sure nothing went wrong when reading over NFS --
! ;; check once more.
! (when (file-exists-p
! (setq file (expand-file-name (number-to-string article)
! nnml-current-directory)))
! (nnml-update-file-alist t)
! file))))
(defun nnml-deletable-article-p (group article)
"Say whether ARTICLE in GROUP can be deleted."
--- 517,535 ----
(defun nnml-article-to-file (article)
(nnml-update-file-alist)
(let (file)
! (if (setq file
! (if nnml-use-compressed-files
! (cdr (assq article nnml-article-file-alist))
! (number-to-string article)))
(expand-file-name file nnml-current-directory)
! (when (not nnheader-directory-files-is-safe)
! ;; Just to make sure nothing went wrong when reading over NFS --
! ;; check once more.
! (when (file-exists-p
! (setq file (expand-file-name (number-to-string article)
! nnml-current-directory)))
! (nnml-update-file-alist t)
! file)))))
(defun nnml-deletable-article-p (group article)
"Say whether ARTICLE in GROUP can be deleted."
***************
*** 517,523 ****
;; 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.
(while (and (not number)
alist)
(or (string= (caar alist) nnml-current-group)
--- 551,557 ----
;; 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.
(while (and (not number)
alist)
(or (string= (caar alist) nnml-current-group)
***************
*** 587,594 ****
(defun nnml-save-mail (group-art)
"Called narrowed to an article."
! (let (chars headers)
(setq chars (nnmail-insert-lines))
(nnmail-insert-xref group-art)
(run-hooks 'nnmail-prepare-save-mail-hook)
(run-hooks 'nnml-prepare-save-mail-hook)
--- 621,632 ----
(defun nnml-save-mail (group-art)
"Called narrowed to an article."
! (let (chars headers extension)
(setq chars (nnmail-insert-lines))
+ (setq extension
+ (and nnml-use-compressed-files
+ (> chars 1000)
+ ".gz"))
(nnmail-insert-xref group-art)
(run-hooks 'nnmail-prepare-save-mail-hook)
(run-hooks 'nnml-prepare-save-mail-hook)
***************
*** 603,609 ****
(nnml-possibly-create-directory (caar ga))
(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)
--- 641,648 ----
(nnml-possibly-create-directory (caar ga))
(let ((file (concat (nnmail-group-pathname
(caar ga) nnml-directory)
! (int-to-string (cdar ga))
! extension)))
(if first
;; It was already saved, so we just make a hard link.
(funcall nnmail-crosspost-link-function first file t)
***************
*** 636,642 ****
(unless nnml-article-file-alist
(setq nnml-article-file-alist
(sort
! (nnheader-article-to-file-alist nnml-current-directory)
'car-less-than-car)))
(setq active
(if nnml-article-file-alist
--- 675,681 ----
(unless nnml-article-file-alist
(setq nnml-article-file-alist
(sort
! (nnml-current-group-article-to-file-alist)
'car-less-than-car)))
(setq active
(if nnml-article-file-alist
***************
*** 660,666 ****
(nnheader-insert-nov headers)))
(defsubst nnml-header-value ()
! (buffer-substring (match-end 0) (progn (end-of-line) (point))))
(defun nnml-parse-head (chars &optional number)
"Parse the head of the current buffer."
--- 699,705 ----
(nnheader-insert-nov headers)))
(defsubst nnml-header-value ()
! (buffer-substring (match-end 0) (gnus-point-at-eol)))
(defun nnml-parse-head (chars &optional number)
"Parse the head of the current buffer."
***************
*** 669,698 ****
(unless (zerop (buffer-size))
(narrow-to-region
(goto-char (point-min))
! (if (search-forward "\n\n" nil t) (1- (point)) (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))
! (let ((buffer (get-buffer-create (format " *nnml overview %s*" group))))
! (save-excursion
! (set-buffer buffer)
! (set (make-local-variable 'nnml-nov-buffer-file-name)
! (expand-file-name
! nnml-nov-file-name
! (nnmail-group-pathname group nnml-directory)))
! (erase-buffer)
! (when (file-exists-p nnml-nov-buffer-file-name)
! (nnheader-insert-file-contents nnml-nov-buffer-file-name)))
(push (cons group buffer) nnml-nov-buffer-alist)
buffer)))
--- 708,737 ----
(unless (zerop (buffer-size))
(narrow-to-region
(goto-char (point-min))
! (if (re-search-forward "\n\r?\n" nil t)
! (1- (point))
! (point-max))))
! (let ((headers (nnheader-parse-naked-head)))
(mail-header-set-chars headers chars)
(mail-header-set-number headers number)
headers))))
+ (defun nnml-get-nov-buffer (group)
+ (let ((buffer (get-buffer-create (format " *nnml overview %s*" group))))
+ (save-excursion
+ (set-buffer buffer)
+ (set (make-local-variable 'nnml-nov-buffer-file-name)
+ (expand-file-name
+ nnml-nov-file-name
+ (nnmail-group-pathname group nnml-directory)))
+ (erase-buffer)
+ (when (file-exists-p nnml-nov-buffer-file-name)
+ (nnheader-insert-file-contents nnml-nov-buffer-file-name)))
+ buffer))
+
(defun nnml-open-nov (group)
(or (cdr (assoc group nnml-nov-buffer-alist))
! (let ((buffer (nnml-get-nov-buffer group)))
(push (cons group buffer) nnml-nov-buffer-alist)
buffer)))
***************
*** 709,721 ****
(setq nnml-nov-buffer-alist (cdr nnml-nov-buffer-alist)))))
;;;###autoload
! (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
;; numbers in empty groups.
(nnmail-activate 'nnml)
! (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 nil t)
--- 748,761 ----
(setq nnml-nov-buffer-alist (cdr nnml-nov-buffer-alist)))))
;;;###autoload
! (defun nnml-generate-nov-databases (&optional server)
"Generate NOV databases in all nnml directories."
! (interactive (list (or (nnoo-current-server 'nnml) "")))
;; Read the active file to make sure we don't re-use articles
;; numbers in empty groups.
(nnmail-activate 'nnml)
! (unless (nnml-server-opened server)
! (nnml-open-server server))
(setq nnml-directory (expand-file-name nnml-directory))
;; Recurse down the directories.
(nnml-generate-nov-databases-1 nnml-directory nil t)
***************
*** 754,768 ****
(eval-when-compile (defvar files))
(defun nnml-generate-active-info (dir)
;; Update the active info for this 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 (caar files)
! (let ((f files))
! (while (cdr f) (setq f (cdr f)))
! (caar f))))
nnml-group-alist)))
(defun nnml-generate-nov-file (dir files)
--- 794,811 ----
(eval-when-compile (defvar files))
(defun nnml-generate-active-info (dir)
;; Update the active info for this group.
! (let* ((group (nnheader-file-to-group
! (directory-file-name dir) nnml-directory))
! (entry (assoc group nnml-group-alist))
! (last (or (caadr entry) 0)))
! (setq nnml-group-alist (delq entry nnml-group-alist))
(push (list group
! (cons (or (caar files) (1+ last))
! (max last
! (or (let ((f files))
! (while (cdr f) (setq f (cdr f)))
! (caar f))
! 0))))
nnml-group-alist)))
(defun nnml-generate-nov-file (dir files)
***************
*** 786,792 ****
(narrow-to-region
(goto-char (point-min))
(progn
! (search-forward "\n\n" nil t)
(setq chars (- (point-max) (point)))
(max (point-min) (1- (point)))))
(unless (zerop (buffer-size))
--- 829,835 ----
(narrow-to-region
(goto-char (point-min))
(progn
! (re-search-forward "\n\r?\n" nil t)
(setq chars (- (point-max) (point)))
(max (point-min) (1- (point)))))
(unless (zerop (buffer-size))
***************
*** 820,829 ****
t))
(defun nnml-update-file-alist (&optional force)
! (when (or (not nnml-article-file-alist)
! force)
! (setq nnml-article-file-alist
! (nnheader-article-to-file-alist nnml-current-directory))))
(provide 'nnml)
--- 863,1020 ----
t))
(defun nnml-update-file-alist (&optional force)
! (when nnml-use-compressed-files
! (when (or (not nnml-article-file-alist)
! force)
! (setq nnml-article-file-alist
! (nnml-current-group-article-to-file-alist)))))
!
! (defun nnml-directory-articles (dir)
! "Return a list of all article files in a directory.
! Use the nov database for that directory if available."
! (if (or gnus-nov-is-evil nnml-nov-is-evil
! (not (file-exists-p
! (expand-file-name nnml-nov-file-name dir))))
! (nnheader-directory-articles dir)
! ;; build list from .overview if available
! ;; We would use nnml-open-nov, except that nnml-nov-buffer-alist is
! ;; defvoo'd, and we might get called when it hasn't been swapped in.
! (save-excursion
! (let ((list nil)
! art
! (buffer (nnml-get-nov-buffer nnml-current-group)))
! (set-buffer buffer)
! (goto-char (point-min))
! (while (not (eobp))
! (setq art (read (current-buffer)))
! (push art list)
! (forward-line 1))
! list))))
!
! (defun nnml-current-group-article-to-file-alist ()
! "Return an alist of article/file pairs in the current group.
! Use the nov database for the current group if available."
! (if (or nnml-use-compressed-files
! gnus-nov-is-evil
! nnml-nov-is-evil
! (not (file-exists-p
! (expand-file-name nnml-nov-file-name
! nnml-current-directory))))
! (nnheader-article-to-file-alist nnml-current-directory)
! ;; build list from .overview if available
! (save-excursion
! (let ((alist nil)
! (buffer (nnml-get-nov-buffer nnml-current-group))
! art)
! (set-buffer buffer)
! (goto-char (point-min))
! (while (not (eobp))
! (setq art (read (current-buffer)))
! ;; assume file name is unadorned (ie. not compressed etc)
! (push (cons art (int-to-string art)) alist)
! (forward-line 1))
! alist))))
!
! (deffoo nnml-request-set-mark (group actions &optional server)
! (nnml-possibly-change-directory group server)
! (unless nnml-marks-is-evil
! (nnml-open-marks group server)
! (dolist (action actions)
! (let ((range (nth 0 action))
! (what (nth 1 action))
! (marks (nth 2 action)))
! (assert (or (eq what 'add) (eq what 'del)) t
! "Unknown request-set-mark action: %s" what)
! (dolist (mark marks)
! (setq nnml-marks (gnus-update-alist-soft
! mark
! (funcall (if (eq what 'add) 'gnus-range-add
! 'gnus-remove-from-range)
! (cdr (assoc mark nnml-marks)) range)
! nnml-marks)))))
! (nnml-save-marks group server))
! nil)
!
! (deffoo nnml-request-update-info (group info &optional server)
! (nnml-possibly-change-directory group server)
! (when (and (not nnml-marks-is-evil) (nnml-marks-changed-p group))
! (nnheader-message 8 "Updating marks for %s..." group)
! (nnml-open-marks group server)
! ;; Update info using `nnml-marks'.
! (mapcar (lambda (pred)
! (unless (memq (cdr pred) gnus-article-unpropagated-mark-lists)
! (gnus-info-set-marks
! info
! (gnus-update-alist-soft
! (cdr pred)
! (cdr (assq (cdr pred) nnml-marks))
! (gnus-info-marks info))
! t)))
! gnus-article-mark-lists)
! (let ((seen (cdr (assq 'read nnml-marks))))
! (gnus-info-set-read info
! (if (and (integerp (car seen))
! (null (cdr seen)))
! (list (cons (car seen) (car seen)))
! seen)))
! (nnheader-message 8 "Updating marks for %s...done" group))
! info)
!
! (defun nnml-marks-changed-p (group)
! (let ((file (expand-file-name nnml-marks-file-name
! (nnmail-group-pathname group nnml-directory))))
! (if (null (gnus-gethash file nnml-marks-modtime))
! t ;; never looked at marks file, assume it has changed
! (not (equal (gnus-gethash file nnml-marks-modtime)
! (nth 5 (file-attributes file)))))))
!
! (defun nnml-save-marks (group server)
! (let ((file-name-coding-system nnmail-pathname-coding-system)
! (file (expand-file-name nnml-marks-file-name
! (nnmail-group-pathname group nnml-directory))))
! (condition-case err
! (progn
! (nnml-possibly-create-directory group)
! (with-temp-file file
! (erase-buffer)
! (gnus-prin1 nnml-marks)
! (insert "\n"))
! (gnus-sethash file
! (nth 5 (file-attributes file))
! nnml-marks-modtime))
! (error (or (gnus-yes-or-no-p
! (format "Could not write to %s (%s). Continue? " file err))
! (error "Cannot write to %s (%s)" err))))))
!
! (defun nnml-open-marks (group server)
! (let ((file (expand-file-name
! nnml-marks-file-name
! (nnmail-group-pathname group nnml-directory))))
! (if (file-exists-p file)
! (condition-case err
! (with-temp-buffer
! (gnus-sethash file (nth 5 (file-attributes file))
! nnml-marks-modtime)
! (nnheader-insert-file-contents file)
! (setq nnml-marks (read (current-buffer)))
! (dolist (el gnus-article-unpropagated-mark-lists)
! (setq nnml-marks (gnus-remassoc el nnml-marks))))
! (error (or (gnus-yes-or-no-p
! (format "Error reading nnml marks file %s (%s).
Continuing will use marks from .newsrc.eld. Continue? " file err))
! (error "Cannot read nnml marks file %s (%s)" file err))))
! ;; User didn't have a .marks file. Probably first time
! ;; user of the .marks stuff. Bootstrap it from .newsrc.eld.
! (let ((info (gnus-get-info
! (gnus-group-prefixed-name
! group
! (gnus-server-to-method (format "nnml:%s" server))))))
! (nnheader-message 7 "Bootstrapping marks for %s..." group)
! (setq nnml-marks (gnus-info-marks info))
! (push (cons 'read (gnus-info-read info)) nnml-marks)
! (dolist (el gnus-article-unpropagated-mark-lists)
! (setq nnml-marks (gnus-remassoc el nnml-marks)))
! (nnml-save-marks group server)
! (nnheader-message 7 "Bootstrapping marks for %s...done" group)))))
(provide 'nnml)
- [Emacs-diffs] Changes to emacs/lisp/gnus/nnml.el [emacs-unicode-2],
Miles Bader <=