[gnus git] branch master updated: =2= (nntp-finish-retrieve-group-infos): Protect against the first part not returning any data. ; * proto-stream.el (open-protocol-stream): Document the return value.

       via  0bca1908b8a435b5ade1dbebeb9f98207e81d9c4 (commit)
       via  bcfcbbaf5361e3019ab21b4e96967150f74e2a62 (commit)
      from  051c1fc03aadf16a08d4222dda114fd461563397 (commit)


- Log -----------------------------------------------------------------
commit 0bca1908b8a435b5ade1dbebeb9f98207e81d9c4
Author: Lars Ingebrigtsen <[email protected]>
Date:   Sun Feb 6 08:46:10 2011 -0800

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05d3114..6f5bfeb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-06  Lars Ingebrigtsen  <[email protected]>
 
+	* 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  <[email protected]>
diff --git a/lisp/nntp.el b/lisp/nntp.el
index cae0150..0e009b2 100644
--- 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)
-	(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

commit bcfcbbaf5361e3019ab21b4e96967150f74e2a62
Author: Lars Ingebrigtsen <[email protected]>
Date:   Sun Feb 6 08:06:43 2011 -0800

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 600b442..05d3114 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-06  Lars Ingebrigtsen  <[email protected]>
+
+	* proto-stream.el (open-protocol-stream): Document the return value.
+
 2011-02-06  Julien Danjou  <[email protected]>
 
 	* message.el (message-setup-1): Handle message-generate-headers-first
diff --git a/lisp/proto-stream.el b/lisp/proto-stream.el
index 9117ac9..fdf2abf 100644
--- a/lisp/proto-stream.el
+++ b/lisp/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)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog       |    7 +++++++
 lisp/nntp.el         |    6 ++++--
 lisp/proto-stream.el |   10 +++++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project