[Emacs-diffs] /srv/bzr/emacs/trunk r102597: proto-stream.el (proto-stream-open-tls): Return nil if we don't get any stream.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102597
author: Gnus developers
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2010-12-06 23:27:17 +0000
message:
  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.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/proto-stream.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-12-05 22:17:34 +0000
+++ b/doc/misc/ChangeLog        2010-12-06 23:27:17 +0000
@@ -1,3 +1,8 @@
+2010-12-06  Tassilo Horn  <address@hidden>
+
+       * gnus.texi (Server Commands): Point to the rest of the server
+       commands.
+
 2010-12-04  Lars Magne Ingebrigtsen  <address@hidden>
 
        * gnus.texi (Paging the Article): Note the reverse meanings of `C-u C-u

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2010-12-05 22:17:34 +0000
+++ b/doc/misc/gnus.texi        2010-12-06 23:27:17 +0000
@@ -13885,6 +13885,9 @@
 
 @end table
 
+Some more commands for closing, disabling, and re-opening servers are
+listed in @ref{Unavailable Servers}.
+
 
 @node Example Methods
 @subsection Example Methods

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-12-06 22:16:10 +0000
+++ b/lisp/gnus/ChangeLog       2010-12-06 23:27:17 +0000
@@ -1,5 +1,8 @@
 2010-12-06  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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

=== modified file 'lisp/gnus/proto-stream.el'
--- a/lisp/gnus/proto-stream.el 2010-12-03 02:56:42 +0000
+++ b/lisp/gnus/proto-stream.el 2010-12-06 23:27:17 +0000
@@ -219,16 +219,18 @@
                        '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