diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-02 22:05:38 -0700 |
| commit | 9a70f03d70e44db2ec9c6d2952cb8a1deae15000 (patch) | |
| tree | c0efd5c0a208640c0a883f4566df1b40caa3aaad /lisp/net/network-stream.el | |
| parent | 29c8a348c5c9f326af54a3d30f69cde98fe300bb (diff) | |
| download | emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.gz | |
Merge from trunk.
Diffstat (limited to 'lisp/net/network-stream.el')
| -rw-r--r-- | lisp/net/network-stream.el | 2 |
1 files changed, 1 insertions, 1 deletions
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'. |