From: Gnus developers <ding@gnus.org>
Date: Mon, 6 Dec 2010 23:27:17 +0000 (+0000)
Subject: proto-stream.el (proto-stream-open-tls): Return nil if we don't get any stream.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~31
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=516aa569e1d70d51ae1d8d12a4b2e7281156cb8c;p=emacs.git

proto-stream.el (proto-stream-open-tls): Return nil if we don't get any stream.
gnus.texi (Server Commands): Point to the rest of the server commands.
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 468a68b0a80..b1b3b440767 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-06  Tassilo Horn  <tassilo@member.fsf.org>
+
+	* gnus.texi (Server Commands): Point to the rest of the server
+	commands.
+
 2010-12-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus.texi (Paging the Article): Note the reverse meanings of `C-u C-u
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 5b8a0b45683..2df6d90cc07 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -13885,6 +13885,9 @@ hence getting a correct total article count.
 
 @end table
 
+Some more commands for closing, disabling, and re-opening servers are
+listed in @ref{Unavailable Servers}.
+
 
 @node Example Methods
 @subsection Example Methods
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ef4a7637b6d..0e34fbc5f64 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,8 @@
 2010-12-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* proto-stream.el (proto-stream-open-tls): Return nil if we don't get
+	any stream.
+
 	* shr.el (shr-tag-font): Colorize the region.
 	(shr-tag-body): Ditto.
 	(shr-tag-font): Actually let the styles be inherited instead of
diff --git a/lisp/gnus/proto-stream.el b/lisp/gnus/proto-stream.el
index fe764dcf01d..6c90f3a112d 100644
--- a/lisp/gnus/proto-stream.el
+++ b/lisp/gnus/proto-stream.el
@@ -219,16 +219,18 @@ command to switch on STARTTLS otherwise."
 			'open-gnutls-stream
 		      'open-tls-stream)
 		    name buffer host service)))
-      ;; If we're using tls.el, we have to delete the output from
-      ;; openssl/gnutls-cli.
-      (unless (fboundp 'open-gnutls-stream)
-	(proto-stream-get-response
-	 stream start (proto-stream-eoc parameters))
-	(goto-char (point-min))
-	(when (re-search-forward (proto-stream-eoc parameters) nil t)
-	  (goto-char (match-beginning 0))
-	  (delete-region (point-min) (line-beginning-position))))
-      (proto-stream-capability-open start stream parameters))))
+      (if (null stream)
+	  nil
+	;; If we're using tls.el, we have to delete the output from
+	;; openssl/gnutls-cli.
+	(unless (fboundp 'open-gnutls-stream)
+	  (proto-stream-get-response
+	   stream start (proto-stream-eoc parameters))
+	  (goto-char (point-min))
+	  (when (re-search-forward (proto-stream-eoc parameters) nil t)
+	    (goto-char (match-beginning 0))
+	    (delete-region (point-min) (line-beginning-position))))
+	(proto-stream-capability-open start stream parameters)))))
 
 (defun proto-stream-open-shell (name buffer host service parameters)
   (proto-stream-capability-open