shr: Render td content with shr-descend

[gnus] / lisp / proto-stream.el

diff --git a/lisp/proto-stream.el b/lisp/proto-stream.el
index 3cbbb98..fe764dc 100644 (file)
--- a/lisp/proto-stream.el
+++ b/lisp/proto-stream.el
@@ -1,4 +1,5 @@
 ;;; proto-stream.el --- negotiating TLS, STARTTLS and other connections
+
 ;; Copyright (C) 2010 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -6,20 +7,18 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -96,11 +95,11 @@ 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."
   (let ((type (or (cadr (memq :type parameters)) 'network)))
-    (when (and (eq type 'starttls)
-              (fboundp 'open-gnutls-stream))
+    (cond
+     ((eq type 'starttls)
       (setq type 'network))
-    (when (eq type 'ssl)
-      (setq type 'tls))
+     ((eq type 'ssl)
+      (setq type 'tls)))
     (destructuring-bind (stream greeting capabilities)
        (funcall (intern (format "proto-stream-open-%s" type) obarray)
                 name buffer host service parameters)