From 32ca8357a7672e50a3396b0c9190ce94416285f2 Mon Sep 17 00:00:00 2001 From: ichikawa Date: Sun, 30 Aug 1998 04:42:38 +0000 Subject: [PATCH] Sync up with gnus-5.6.42 --- lisp/ChangeLog | 25 ++++++++++++++++++++ lisp/gnus-agent.el | 66 +++++++++++++++++++++++++++------------------------- lisp/gnus-cache.el | 3 ++- lisp/gnus-sum.el | 17 +++++++------- lisp/gnus.el | 4 ++-- lisp/nnvirtual.el | 8 ++++--- texi/gnus-ja.texi | 6 ++--- texi/gnus.texi | 8 +++---- texi/message.texi | 6 ++--- 9 files changed, 87 insertions(+), 56 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 94fbbde..d06cf06 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,28 @@ +Sat Aug 29 19:17:19 1998 Lars Magne Ingebrigtsen + + * gnus.el: Gnus v5.6.42 is released. + +1998-08-29 17:06:27 Simon Josefsson + + * gnus-sum.el (gnus-summary-make-menu-bar): Typo. + +1998-08-29 12:47:42 Tatsuya Ichikawa + + * gnus-agent.el: Use nnheader-insert-file-contents. + +1998-08-29 12:18:18 Lars Magne Ingebrigtsen + + * nnvirtual.el (nnvirtual-request-group): Update the right group. + +1998-08-27 16:46:38 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-data-compute-positions): Didn't work on hidden + threads. + + * nnvirtual.el (nnvirtual-request-group): Work when always + updating. + (nnvirtual-always-rescan): Default to t. + Thu Aug 27 11:03:59 1998 Lars Magne Ingebrigtsen * gnus.el: Gnus v5.6.41 is released. diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index d9f56ba..c170e7e 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -644,7 +644,7 @@ the actual number of articles toggled is returned." ;; Prune off articles that we have already fetched. (while (and articles (cdr (assq (car articles) gnus-agent-article-alist))) - (pop articles)) + (pop articles)) (let ((arts articles)) (while (cdr arts) (if (cdr (assq (cadr arts) gnus-agent-article-alist)) @@ -751,37 +751,39 @@ the actual number of articles toggled is returned." (pop gnus-agent-group-alist)))) (defun gnus-agent-fetch-headers (group &optional force) - (when (gnus-agent-load-alist group) - (let ((articles (gnus-uncompress-range - (cons (1+ (caar (last (gnus-agent-load-alist group)))) - (cdr (gnus-active group)))))) - ;; Fetch them. - (when articles - (gnus-message 7 "Fetching headers for %s..." group) - (save-excursion - (set-buffer nntp-server-buffer) - (unless (eq 'nov (gnus-retrieve-headers articles group)) - (nnvirtual-convert-headers)) - (goto-char (point-min)) - (while (not (eobp)) - (goto-char (point-at-eol)) - (insert "\t") - (forward-line 1)) - ;; Save these headers for later processing. - (copy-to-buffer gnus-agent-overview-buffer (point-min) (point-max)) - (let (file) - (when (file-exists-p - (setq file (gnus-agent-article-name ".overview" group))) - (gnus-agent-braid-nov group articles file)) - (gnus-make-directory (nnheader-translate-file-chars - (file-name-directory file))) - (write-region (point-min) (point-max) file nil 'silent) - (gnus-agent-save-alist group articles nil) - (gnus-agent-enter-history - "last-header-fetched-for-session" - (list (cons group (nth (- (length articles) 1) articles))) - (gnus-time-to-day (current-time))) - articles)))))) + (gnus-agent-load-alist group) + ;; Find out what headers we need to retrieve. + (when articles + (while (and articles + (assq (car articles) gnus-agent-article-alist)) + (pop articles)) + (let ((arts articles)) + (while (cdr arts) + (if (assq (cadr arts) gnus-agent-article-alist) + (setcdr arts (cddr arts)) + (setq arts (cdr arts))))) + ;; Fetch them. + (when articles + (gnus-message 7 "Fetching headers for %s..." group) + (save-excursion + (set-buffer nntp-server-buffer) + (unless (eq 'nov (gnus-retrieve-headers articles group)) + (nnvirtual-convert-headers)) + ;; Save these headers for later processing. + (copy-to-buffer gnus-agent-overview-buffer (point-min) (point-max)) + (let (file) + (when (file-exists-p + (setq file (gnus-agent-article-name ".overview" group))) + (gnus-agent-braid-nov group articles file)) + (gnus-make-directory (nnheader-translate-file-chars + (file-name-directory file))) + (write-region (point-min) (point-max) file nil 'silent) + (gnus-agent-save-alist group articles nil) + (gnus-agent-enter-history "last-header-fetched-for-session" + (list (cons group (nth (- (length articles) 1) articles))) + (gnus-time-to-day (current-time))) + t))))) + (defsubst gnus-agent-copy-nov-line (article) (let (b e) diff --git a/lisp/gnus-cache.el b/lisp/gnus-cache.el index 4612d17..470fb21 100644 --- a/lisp/gnus-cache.el +++ b/lisp/gnus-cache.el @@ -393,7 +393,8 @@ Returns the list of articles removed." (save-excursion (setq gnus-cache-buffer (cons group - (set-buffer (gnus-get-buffer-create " *gnus-cache-overview*")))) + (set-buffer (gnus-get-buffer-create + " *gnus-cache-overview*")))) (buffer-disable-undo (current-buffer)) ;; Insert the contents of this group's cache overview. (erase-buffer) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index bab95a4..816080f 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1748,7 +1748,7 @@ increase the score of each group you read." ["Send a bug report" gnus-bug t] ("Exit" ["Catchup and exit" gnus-summary-catchup-and-exit t] - ["Catchup all and exit" gnus-summary-catchup-and-exit t] + ["Catchup all and exit" gnus-summary-catchup-all-and-exit t] ["Catchup and goto next" gnus-summary-catchup-and-goto-next-group t] ["Exit group" gnus-summary-exit t] ["Exit group without updating" gnus-summary-exit-no-update t] @@ -2045,13 +2045,14 @@ The following commands are available: (setq gnus-newsgroup-data-reverse nil) (let ((data gnus-newsgroup-data)) (save-excursion - (goto-char (point-min)) - (while data - (while (get-text-property (point) 'gnus-intangible) - (forward-line 1)) - (gnus-data-set-pos (car data) (+ (point) 3)) - (setq data (cdr data)) - (forward-line 1))))) + (gnus-save-hidden-threads + (goto-char (point-min)) + (while data + (while (get-text-property (point) 'gnus-intangible) + (forward-line 1)) + (gnus-data-set-pos (car data) (+ (point) 3)) + (setq data (cdr data)) + (forward-line 1)))))) (defun gnus-summary-article-pseudo-p (article) "Say whether this article is a pseudo article or not." diff --git a/lisp/gnus.el b/lisp/gnus.el index 43e0382..edfd36d 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -250,11 +250,11 @@ is restarted, and sometimes reloaded." :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) -(defconst gnus-version-number "6.8.16" +(defconst gnus-version-number "6.8.17" "Version number for this version of gnus.") (defconst gnus-version - (format "Semi-gnus %s (based on Gnus 5.6.41; for SEMI 1.8, FLIM 1.8/1.9)" + (format "Semi-gnus %s (based on Gnus 5.6.42; for SEMI 1.8, FLIM 1.8/1.9)" gnus-version-number) "Version string for this version of gnus.") diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el index d8bf70d..4829341 100644 --- a/lisp/nnvirtual.el +++ b/lisp/nnvirtual.el @@ -43,7 +43,7 @@ (nnoo-declare nnvirtual) -(defvoo nnvirtual-always-rescan nil +(defvoo nnvirtual-always-rescan t "*If non-nil, always scan groups for unread articles when entering a group. If this variable is nil (which is the default) and you read articles in a component group after the virtual group has been activated, the @@ -259,12 +259,14 @@ to virtual article number.") (setq nnvirtual-current-group nil) (nnheader-report 'nnvirtual "No component groups in %s" group)) (t + (setq nnvirtual-current-group group) (when (or (not dont-check) nnvirtual-always-rescan) (nnvirtual-create-mapping) (when nnvirtual-always-rescan - (nnvirtual-request-update-info group (gnus-get-info group)))) - (setq nnvirtual-current-group group) + (nnvirtual-request-update-info + (nnvirtual-current-group) + (gnus-get-info (nnvirtual-current-group))))) (nnheader-insert "211 %d 1 %d %s\n" nnvirtual-mapping-len nnvirtual-mapping-len group)))) diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index c6c6ec5..a12f9f2 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus-ja -@settitle Semi-gnus 6.8.13 Manual +@settitle Semi-gnus 6.8.17 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -345,7 +345,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Semi-gnus 6.8.13 Manual +@title Semi-gnus 6.8.17 Manual @author by Lars Magne Ingebrigtsen @author by members of Semi-gnus mailing-list @@ -399,7 +399,7 @@ Semi-gnus は、大きな絵が入っていたりさまざまな形式を用いたりしているちょっ な言語圏を差別しません。ああ、クリンゴンの方は Unicode Next Generationを お待ちください。 -この説明書は Semi-gnus 6.8.13 に対応します。 +この説明書は Semi-gnus 6.8.17 に対応します。 @end ifinfo diff --git a/texi/gnus.texi b/texi/gnus.texi index 430f277..6a2bd37 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus -@settitle Semi-gnus 6.8.16 Manual +@settitle Semi-gnus 6.8.17 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -318,7 +318,7 @@ into another language, under the above conditions for modified versions. @tex @titlepage -@title Semi-gnus 6.8.16 Manual +@title Semi-gnus 6.8.17 Manual @author by Lars Magne Ingebrigtsen @page @@ -354,14 +354,14 @@ can be gotten by any nefarious means you can think of---@sc{nntp}, local spool or your mbox file. All at the same time, if you want to push your luck. -Semi-gnus provides MIME features based on SEMI API. So Semi-gnus +<<<