Merge changes made in Gnus trunk

gnus-start.el (gnus-get-unread-articles): Clear out "early" methods so that previous errors don't prohibit getting new news.
nnimap.el (nnimap-retrieve-group-data-early): Ditto.
nntp.el (nntp-retrieve-group-data-early): Ditto.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 94c5fba8731d56aaadd6aacb0c88a563e4f86305..875ab494f2ffbea7081ede39f41b0c47421a8e90 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-27  Lars Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-start.el (gnus-get-unread-articles): Clear out "early" methods
+       so that previous errors don't prohibit getting new news.
+
+       * nnimap.el (nnimap-retrieve-group-data-early): Ditto.
+
+       * nntp.el (nntp-retrieve-group-data-early): Ditto.
+
 2012-01-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-sum.el (gnus-summary-mode): Don't make bidi-paragraph-direction

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 07409162ab8f4a2f092cb6b23b88b5a9d15e53e5..9b1d5681e6ce9ed4f3156cd4b200ecea469c7315 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1714,6 +1714,21 @@ backend check whether the group actually exists."
          (with-current-buffer nntp-server-buffer
            (gnus-read-active-file-1 method nil)))))
 
+    ;; Clear out all the early methods.
+    (dolist (elem type-cache)
+      (destructuring-bind (method method-type infos dummy) elem
+       (when (and method
+                  infos
+                  (gnus-check-backend-function
+                   'retrieve-group-data-early (car method))
+                  (not (gnus-method-denied-p method)))
+         (when (ignore-errors (gnus-get-function method 'open-server))
+           (unless (gnus-server-opened method)
+             (gnus-open-server method))
+           (when (gnus-server-opened method)
+             ;; Just mark this server as "cleared".
+             (gnus-retrieve-group-data-early method nil))))))
+
     ;; Start early async retrieval of data.
     (let ((done-methods nil)
          sanity-spec)

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 0df7ffce671335e2011361d1e6c4e4ef9740600e..afa4bdf3dbd9b2820a7a4c783aaf9389e88e299b 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1213,7 +1213,8 @@ textual parts.")
       t)))
 
 (deffoo nnimap-retrieve-group-data-early (server infos)
-  (when (nnimap-possibly-change-group nil server)
+  (when (and (nnimap-possibly-change-group nil server)
+            infos)
     (with-current-buffer (nnimap-buffer)
       (erase-buffer)
       (setf (nnimap-group nnimap-object) nil)

diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index c740f6143568027d4ac0311c2659e947cf467236..7148fdbb216a221b37ce437cb0a657806ba970ba 100644 (file)
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -772,7 +772,11 @@ command whose response triggered the error."
   "Retrieve group info on INFOS."
   (nntp-with-open-group nil server
     (let ((buffer (nntp-find-connection-buffer nntp-server-buffer)))
+      (unless infos
+       (with-current-buffer buffer
+         (setq nntp-retrieval-in-progress nil)))
       (when (and buffer
+                infos
                 (with-current-buffer buffer
                   (not nntp-retrieval-in-progress)))
        ;; The first time this is run, this variable is `try'.  So we