From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Tue, 2 Aug 2011 13:34:05 +0000 (+0200)
Subject: Use `starttls-available-p' to see whether starttls.el can be used.
X-Git-Tag: emacs-pretest-24.0.90~104^2~124^2~66^2~19
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2239d7d5eff3f68a1906773c88f67415ba08bd0a;p=emacs.git

Use `starttls-available-p' to see whether starttls.el can be used.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 791233439bb..ad5cad4307d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* 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  <rudalics@gmx.at>
 
 	* window.el (display-buffer-in-window): Don't set dedicated status
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index bb09d8945c9..ceb094cded7 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -230,7 +230,7 @@ functionality.
 	       (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'.