mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Merge from trunk.

Browse source
This commit is contained in:
Paul Eggert 2011-08-02 22:05:38 -07:00
parent 29c8a348c5
commit 9a70f03d70
60 changed files with 5623 additions and 618 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/net/network-stream.el
View file

@ -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'.