From f7d82d07a7c44aca597330b497905c20d3db8090 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 24 Oct 2002 22:48:14 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 18 +++++++++++++++++- lisp/gnus-agent.el | 31 ++++++++++++++----------------- lisp/nnimap.el | 12 +++++++----- texi/ChangeLog | 5 +++++ texi/gnus-ja.texi | 4 +++- texi/gnus.texi | 4 +++- 6 files changed, 49 insertions(+), 25 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e5a060c..da344f8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2002-10-24 Katsumi Yamaoka + + * gnus-agent.el (gnus-agent-load-alist): Fix parenthesis. + +2002-10-24 Kai Gro,A_(Bjohann + + * gnus-agent.el (gnus-agent-save-alist, gnus-agent-load-alist): + Remove unused optional arg DIR and corresponding code. + + * nnimap.el (nnimap-request-article-part): Include group name in + debugging output. + +2002-10-24 Paul Jarc + + * gnus-agent.el (gnus-agent-fetch-headers): Add some comments. + 2002-10-23 Kai Gro,A_(Bjohann * gnus-agent.el (gnus-agent-fetched-headers): New variable, @@ -9,7 +25,7 @@ seen/recent logic. Remember which headers have been fetched before and don't fetch them again the next time round. - (gnus-agent-load-fetched-headers) + (gnus-agent-load-fetched-headers) (gnus-agent-save-fetched-headers): New functions, for remembering which headers have been fetched before. diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index 024d873..c9dff6f 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -1128,9 +1128,11 @@ This can be added to `gnus-select-article-hook' or gnus-agent-large-newsgroup) 0) articles))) - ;; Add article with marks to list of article headers we want to - ;; fetch. We don't want to fetch all the seen articles, and we - ;; don't want do fetch the recent ones, though. + ;; Add articles with marks to the list of article headers we want to + ;; fetch. Don't fetch articles solely on the basis of a recent or seen + ;; mark, but do fetch recent or seen articles if they have other, more + ;; interesting marks. (We have to fetch articles with boring marks + ;; because otherwise the agent will remove their marks.) (dolist (arts (gnus-info-marks (gnus-get-info group))) (unless (memq (car arts) '(seen recent)) (setq articles (gnus-range-add articles (cdr arts))))) @@ -1237,18 +1239,15 @@ This can be added to `gnus-select-article-hook' or (set-buffer nntp-server-buffer)) (insert-buffer-substring gnus-agent-overview-buffer start)))) -(defun gnus-agent-load-alist (group &optional dir) +(defun gnus-agent-load-alist (group) "Load the article-state alist for GROUP." - (let ((file)) - (setq gnus-agent-article-alist - (gnus-cache-file-contents - (if dir - (expand-file-name ".agentview" dir) - (gnus-agent-article-name ".agentview" group)) - 'gnus-agent-file-loading-cache - 'gnus-agent-read-file)))) - -(defun gnus-agent-save-alist (group &optional articles state dir) + (setq gnus-agent-article-alist + (gnus-cache-file-contents + (gnus-agent-article-name ".agentview" group) + 'gnus-agent-file-loading-cache + 'gnus-agent-read-file))) + +(defun gnus-agent-save-alist (group &optional articles state) "Save the article-state alist for GROUP." (let* ((file-name-coding-system nnmail-pathname-coding-system) (pathname-coding-system nnmail-pathname-coding-system) @@ -1268,9 +1267,7 @@ This can be added to `gnus-select-article-hook' or (setcdr (cadr prev) state))) (setq prev (cdr prev))) (setq gnus-agent-article-alist (cdr all)) - (with-temp-file (if dir - (expand-file-name ".agentview" dir) - (gnus-agent-article-name ".agentview" group)) + (with-temp-file (gnus-agent-article-name ".agentview" group) (princ gnus-agent-article-alist (current-buffer)) (insert "\n")))) diff --git a/lisp/nnimap.el b/lisp/nnimap.el index 2623a3f..4a0d8a4 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -808,7 +808,8 @@ function is generally only called when Gnus is shutting down." nnimap-server-buffer)) article))) (when article - (gnus-message 10 "nnimap: Fetching (part of) article %d..." article) + (gnus-message 10 "nnimap: Fetching (part of) article %d from %s..." + article (or group imap-current-mailbox)) (if (not nnheader-callback-function) (with-current-buffer (or to-buffer nntp-server-buffer) (erase-buffer) @@ -817,11 +818,12 @@ function is generally only called when Gnus is shutting down." (when data (insert (if detail (nth 2 (car data)) data)) (nnheader-ms-strip-cr) - (gnus-message 10 - "nnimap: Fetching (part of) article %d...done" - article) + (gnus-message + 10 "nnimap: Fetching (part of) article %d from %s...done" + article (or group imap-current-mailbox)) (if (bobp) - (nnheader-report 'nnimap "No such article: %s" + (nnheader-report 'nnimap "No such article %d in %s: %s" + article (or group imap-current-mailbox) (imap-error-text nnimap-server-buffer)) (cons group article))))) (add-hook 'imap-fetch-data-hook 'nnimap-callback) diff --git a/texi/ChangeLog b/texi/ChangeLog index 39f7962..0d113d2 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,8 @@ +2002-10-24 ShengHuo ZHU + + * gnus.texi (RSS): Add gnus-summary-mark-as-read-forward into the + example code. From Christoph Conrad . + 2002-10-17 Kai Gro,A_(Bjohann * gnus.texi (Other Marks): Document gnus-downloadable-mark and diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 72784e7..d3b6af7 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -14454,7 +14454,9 @@ Web Newspaper $B$K4X$9$k0J2<$N(B @code{nnshimbun} $BJQ?t$rJQ$($k$3$H$,2DG=$G$ (assq (gnus-summary-article-number) gnus-newsgroup-data)))))) (if url - (browse-url (cdr url)) + (progn + (browse-url (cdr url)) + (gnus-summary-mark-as-read-forward 1)) (gnus-summary-scroll-up arg)))) (eval-after-load "gnus" diff --git a/texi/gnus.texi b/texi/gnus.texi index e0f843b..45f2045 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -14871,7 +14871,9 @@ summary buffer. (assq (gnus-summary-article-number) gnus-newsgroup-data)))))) (if url - (browse-url (cdr url)) + (progn + (browse-url (cdr url)) + (gnus-summary-mark-as-read-forward 1)) (gnus-summary-scroll-up arg)))) (eval-after-load "gnus" -- 1.7.10.4