[Emacs-diffs] /srv/bzr/emacs/trunk r106952: Merge changes made in Gnus trunk

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106952
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2012-01-27 14:32:25 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-start.el
  lisp/gnus/nnimap.el
  lisp/gnus/nntp.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-01-26 23:24:06 +0000
+++ b/lisp/gnus/ChangeLog       2012-01-27 14:32:25 +0000
@@ -1,3 +1,12 @@
+2012-01-27  Lars Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-sum.el (gnus-summary-mode): Don't make bidi-paragraph-direction

=== modified file 'lisp/gnus/gnus-start.el'
--- a/lisp/gnus/gnus-start.el   2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/gnus-start.el   2012-01-27 14:32:25 +0000
@@ -1714,6 +1714,21 @@
          (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)

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2012-01-26 10:43:01 +0000
+++ b/lisp/gnus/nnimap.el       2012-01-27 14:32:25 +0000
@@ -1213,7 +1213,8 @@
       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)

=== modified file 'lisp/gnus/nntp.el'
--- a/lisp/gnus/nntp.el 2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/nntp.el 2012-01-27 14:32:25 +0000
@@ -772,7 +772,11 @@
   "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