From c1d5851dc03bdf27d7ded885526cf0e721d063ed Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Tue, 1 Feb 2011 02:19:04 +0000 Subject: [PATCH] gnus-start.el (gnus-read-active-file-1): Remove dead parameter infos. --- lisp/gnus/ChangeLog | 4 ++++ lisp/gnus/gnus-start.el | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index f9bcd902cd9..ffc2129cb18 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,7 @@ +2011-02-01 Lars Ingebrigtsen + + * gnus-start.el (gnus-read-active-file-1): Remove dead parameter infos. + 2011-01-31 Lars Ingebrigtsen * gnus-art.el (article-transform-date): Rewrite to still work when diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 3879df3c4b6..7517c871c7d 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -1700,6 +1700,8 @@ If SCAN, request a scan of that group as well." 'retrieve-group-data-early (car method))) (when (gnus-check-backend-function 'request-scan (car method)) (gnus-request-scan nil method)) + ;; Store the token we get back from -early so that we + ;; can pass it to -finish later. (setcar (nthcdr 3 elem) (gnus-retrieve-group-data-early method infos))))))) @@ -1741,6 +1743,8 @@ If SCAN, request a scan of that group as well." (defun gnus-read-active-for-groups (method infos early-data) (with-current-buffer nntp-server-buffer (cond + ;; Finish up getting the data from the methods that have -early + ;; methods. ((and (gnus-check-backend-function 'finish-retrieve-group-infos (car method)) infos @@ -1748,6 +1752,7 @@ If SCAN, request a scan of that group as well." (gnus-online method))) (gnus-finish-retrieve-group-infos method infos early-data) (gnus-agent-save-active method)) + ;; Most backends have -retrieve-groups. ((and (gnus-check-backend-function 'retrieve-groups (car method)) infos) (when (gnus-check-backend-function 'request-scan (car method)) @@ -1757,8 +1762,11 @@ If SCAN, request a scan of that group as well." (dolist (info infos (nreverse groups)) (push (gnus-group-real-name (gnus-info-group info)) groups)) method))) + ;; Virtually all backends have -request-list. ((gnus-check-backend-function 'request-list (car method)) - (gnus-read-active-file-1 method nil infos)) + (gnus-read-active-file-1 method nil)) + ;; Except nnvirtual and friends, where we request each group, one + ;; by one. (t (dolist (info infos) (gnus-activate-group (gnus-info-group info) nil nil method t)))))) @@ -1987,7 +1995,7 @@ If SCAN, request a scan of that group as well." (message "Quit reading the active file") nil)))))))) -(defun gnus-read-active-file-1 (method force &optional infos) +(defun gnus-read-active-file-1 (method force) (let (where mesg) (setq where (nth 1 method) mesg (format "Reading active file%s via %s..." -- 2.39.5