[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103061: gnus-start.el (gnus-read-act
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103061: gnus-start.el (gnus-read-active-file-1): Remove dead parameter infos. |
Date: |
Tue, 01 Feb 2011 02:19:04 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103061
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-02-01 02:19:04 +0000
message:
gnus-start.el (gnus-read-active-file-1): Remove dead parameter infos.
modified:
lisp/gnus/ChangeLog
lisp/gnus/gnus-start.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-01-31 12:29:31 +0000
+++ b/lisp/gnus/ChangeLog 2011-02-01 02:19:04 +0000
@@ -1,3 +1,7 @@
+2011-02-01 Lars Ingebrigtsen <address@hidden>
+
+ * gnus-start.el (gnus-read-active-file-1): Remove dead parameter infos.
+
2011-01-31 Lars Ingebrigtsen <address@hidden>
* gnus-art.el (article-transform-date): Rewrite to still work when
=== modified file 'lisp/gnus/gnus-start.el'
--- a/lisp/gnus/gnus-start.el 2011-01-31 02:19:13 +0000
+++ b/lisp/gnus/gnus-start.el 2011-02-01 02:19:04 +0000
@@ -1700,6 +1700,8 @@
'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 @@
(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 @@
(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 @@
(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 @@
(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..."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103061: gnus-start.el (gnus-read-active-file-1): Remove dead parameter infos.,
Katsumi Yamaoka <=