(nntp-finish-retrieve-group-infos): Protect against the first part not returning...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05d3114..6f5bfeb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
 
 2011-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
 

+       * nntp.el (nntp-finish-retrieve-group-infos): Protect against the first
+       part not returning any data.
+

        * proto-stream.el (open-protocol-stream): Document the return value.
 
 2011-02-06  Julien Danjou  <julien@danjou.info>
        * proto-stream.el (open-protocol-stream): Document the return value.
 
 2011-02-06  Julien Danjou  <julien@danjou.info>

diff --git a/lisp/nntp.el b/lisp/nntp.el
index cae0150..0e009b2 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -781,7 +781,8 @@ command whose response triggered the error."
       ;; The first time this is run, this variable is `try'.  So we
       ;; try.
       (when (eq nntp-server-list-active-group 'try)
       ;; The first time this is run, this variable is `try'.  So we
       ;; try.
       (when (eq nntp-server-list-active-group 'try)

-       (nntp-try-list-active (gnus-group-real-name (gnus-info-group (car infos)))))
+       (nntp-try-list-active
+        (gnus-group-real-name (gnus-info-group (car infos)))))

       (with-current-buffer (nntp-find-connection-buffer nntp-server-buffer)
        (erase-buffer)
        (let ((nntp-inhibit-erase t)
       (with-current-buffer (nntp-find-connection-buffer nntp-server-buffer)
        (erase-buffer)
        (let ((nntp-inhibit-erase t)


@@ -800,7 +801,8 @@ command whose response triggered the error."
                   (car infos)))
          (received 0)
          (last-point 1))
                   (car infos)))
          (received 0)
          (last-point 1))

-      (when buf
+      (when (and buf
+                count)

        (with-current-buffer buf
          (while (and (gnus-buffer-live-p buf)
                      (progn
        (with-current-buffer buf
          (while (and (gnus-buffer-live-p buf)
                      (progn