Commit c1d5851d authored by Lars Ingebrigtsen's avatar Lars Ingebrigtsen Committed by Katsumi Yamaoka
Browse files

gnus-start.el (gnus-read-active-file-1): Remove dead parameter infos.

parent 4fdfcddf
2011-02-01 Lars Ingebrigtsen <larsi@gnus.org>
* gnus-start.el (gnus-read-active-file-1): Remove dead parameter infos.
2011-01-31 Lars Ingebrigtsen <larsi@gnus.org> 2011-01-31 Lars Ingebrigtsen <larsi@gnus.org>
   
* gnus-art.el (article-transform-date): Rewrite to still work when * gnus-art.el (article-transform-date): Rewrite to still work when
......
...@@ -1700,6 +1700,8 @@ If SCAN, request a scan of that group as well." ...@@ -1700,6 +1700,8 @@ If SCAN, request a scan of that group as well."
'retrieve-group-data-early (car method))) 'retrieve-group-data-early (car method)))
(when (gnus-check-backend-function 'request-scan (car method)) (when (gnus-check-backend-function 'request-scan (car method))
(gnus-request-scan nil 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) (setcar (nthcdr 3 elem)
(gnus-retrieve-group-data-early method infos))))))) (gnus-retrieve-group-data-early method infos)))))))
...@@ -1741,6 +1743,8 @@ If SCAN, request a scan of that group as well." ...@@ -1741,6 +1743,8 @@ If SCAN, request a scan of that group as well."
(defun gnus-read-active-for-groups (method infos early-data) (defun gnus-read-active-for-groups (method infos early-data)
(with-current-buffer nntp-server-buffer (with-current-buffer nntp-server-buffer
(cond (cond
;; Finish up getting the data from the methods that have -early
;; methods.
((and ((and
(gnus-check-backend-function 'finish-retrieve-group-infos (car method)) (gnus-check-backend-function 'finish-retrieve-group-infos (car method))
infos infos
...@@ -1748,6 +1752,7 @@ If SCAN, request a scan of that group as well." ...@@ -1748,6 +1752,7 @@ If SCAN, request a scan of that group as well."
(gnus-online method))) (gnus-online method)))
(gnus-finish-retrieve-group-infos method infos early-data) (gnus-finish-retrieve-group-infos method infos early-data)
(gnus-agent-save-active method)) (gnus-agent-save-active method))
;; Most backends have -retrieve-groups.
((and (gnus-check-backend-function 'retrieve-groups (car method)) ((and (gnus-check-backend-function 'retrieve-groups (car method))
infos) infos)
(when (gnus-check-backend-function 'request-scan (car method)) (when (gnus-check-backend-function 'request-scan (car method))
...@@ -1757,8 +1762,11 @@ If SCAN, request a scan of that group as well." ...@@ -1757,8 +1762,11 @@ If SCAN, request a scan of that group as well."
(dolist (info infos (nreverse groups)) (dolist (info infos (nreverse groups))
(push (gnus-group-real-name (gnus-info-group info)) groups)) (push (gnus-group-real-name (gnus-info-group info)) groups))
method))) method)))
;; Virtually all backends have -request-list.
((gnus-check-backend-function 'request-list (car method)) ((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 (t
(dolist (info infos) (dolist (info infos)
(gnus-activate-group (gnus-info-group info) nil nil method t)))))) (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." ...@@ -1987,7 +1995,7 @@ If SCAN, request a scan of that group as well."
(message "Quit reading the active file") (message "Quit reading the active file")
nil)))))))) nil))))))))
(defun gnus-read-active-file-1 (method force &optional infos) (defun gnus-read-active-file-1 (method force)
(let (where mesg) (let (where mesg)
(setq where (nth 1 method) (setq where (nth 1 method)
mesg (format "Reading active file%s via %s..." mesg (format "Reading active file%s via %s..."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment