Mercurial > emacs
changeset 111839:833427a2cdd5
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.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 06 Dec 2010 23:27:17 +0000 |
| parents | de6f9af48bfa |
| children | b050075901af |
| files | doc/misc/ChangeLog doc/misc/gnus.texi lisp/gnus/ChangeLog lisp/gnus/proto-stream.el |
| diffstat | 4 files changed, 23 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/misc/ChangeLog Mon Dec 06 22:16:10 2010 +0000 +++ b/doc/misc/ChangeLog Mon Dec 06 23:27:17 2010 +0000 @@ -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
--- a/doc/misc/gnus.texi Mon Dec 06 22:16:10 2010 +0000 +++ b/doc/misc/gnus.texi Mon Dec 06 23:27:17 2010 +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
--- a/lisp/gnus/ChangeLog Mon Dec 06 22:16:10 2010 +0000 +++ b/lisp/gnus/ChangeLog Mon Dec 06 23:27:17 2010 +0000 @@ -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
--- a/lisp/gnus/proto-stream.el Mon Dec 06 22:16:10 2010 +0000 +++ b/lisp/gnus/proto-stream.el Mon Dec 06 23:27:17 2010 +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