[Emacs-diffs] /srv/bzr/emacs/trunk r105378: Use `starttls-available-p' to see whether starttls.el can be used.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105378
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2011-08-02 15:34:05 +0200
message:
  Use `starttls-available-p' to see whether starttls.el can be used.
modified:
  lisp/ChangeLog
  lisp/net/network-stream.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-01 18:10:58 +0000
+++ b/lisp/ChangeLog    2011-08-02 13:34:05 +0000
@@ -1,3 +1,8 @@
+2011-08-02  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/network-stream.el (network-stream-open-starttls): Use
+       `starttls-available-p' to see whether starttls.el can be used.
+
 2011-08-01  Martin Rudalics  <address@hidden>
 
        * window.el (display-buffer-in-window): Don't set dedicated status

=== modified file 'lisp/net/network-stream.el'
--- a/lisp/net/network-stream.el        2011-07-07 15:14:17 +0000
+++ b/lisp/net/network-stream.el        2011-08-02 13:34:05 +0000
@@ -230,7 +230,7 @@
               (or builtin-starttls
                   (and (or require-tls
                            (plist-get parameters :use-starttls-if-possible))
-                       (executable-find "gnutls-cli")))
+                       (starttls-available-p)))
               (not (eq (plist-get parameters :type) 'plain)))
       ;; If using external STARTTLS, drop this connection and start
       ;; anew with `starttls-open-stream'.