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

proto-stream.el (open-protocol-stream): Document the return value.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7571016a8cb11dacedd9af0e0d09a26a7b5838ee..1ff45b69c2b2ec2b34f606302aec1b39fc6d01ab 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+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>
 
        * message.el (message-setup-1): Handle message-generate-headers-first

diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index cae0150dd1752e9362a96ad48300bd7d22325963..0e009b2068b93bb36b14e69ac66630baea231a45 100644 (file)
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/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)
-       (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)
@@ -800,7 +801,8 @@ command whose response triggered the error."
                   (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

diff --git a/lisp/gnus/proto-stream.el b/lisp/gnus/proto-stream.el
index 9117ac9f4e37f6333a4cd29b5e6df78df2da1083..fdf2abfea0579b700d95102d84293dd9738c0bb1 100644 (file)
--- a/lisp/gnus/proto-stream.el
+++ b/lisp/gnus/proto-stream.el
@@ -94,7 +94,15 @@ query server for capabilities.  For instance, for IMAP this is
 :starttls-function -- a function that takes one parameter, which
 is the response to the capaibility command.  It should return nil
 if it turns out that the server doesn't support STARTTLS, or the
-command to switch on STARTTLS otherwise."
+command to switch on STARTTLS otherwise.
+
+The return value from this function is a four-element list, where
+the first element is the stream (if connection was successful);
+the second element is the \"greeting\", i. e., the string the
+server sent over on initial contact; the third element is the
+capability string; and the fourth element is either `network' or
+`tls', depending on whether the connection ended up being
+encrypted or not."
   (let ((type (or (cadr (memq :type parameters)) 'network)))
     (cond
      ((eq type 'starttls)