aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2017-11-05 17:26:36 +0200
committerEli Zaretskii2017-11-05 17:26:36 +0200
commitc572e1f329583d40a6ae1a6cf493aba4a58c08e4 (patch)
treeefef82da71ae59786a6530814ceba501eb3f6d41 /src
parenta2cc6d74c5b94633e7fc044765e0ef40a8d63f50 (diff)
downloademacs-c572e1f329583d40a6ae1a6cf493aba4a58c08e4.tar.gz
emacs-c572e1f329583d40a6ae1a6cf493aba4a58c08e4.zip
Return non-nil from gnutls-available-p under GnuTLS 2.x
* doc/misc/emacs-gnutls.texi (Help For Users): Update the documentation of 'gnutls-available-p'. * etc/NEWS (GnuTLS): Mention the change in the value returned by 'gnutls-available-p'. * src/gnutls.c (Fgnutls_available_p): Return non-nil when GnuTLS 2.x is available. (Bug#29147)
Diffstat (limited to 'src')
-rw-r--r--src/gnutls.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gnutls.c b/src/gnutls.c
index 36f65c4acb3..85cebd0e1c6 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -2422,6 +2422,8 @@ GnuTLS AEAD ciphers : the list will contain `AEAD-ciphers'. */)
2422 2422
2423#ifdef HAVE_GNUTLS 2423#ifdef HAVE_GNUTLS
2424 2424
2425 capabilities = Fcons (intern("gnutls"), capabilities);
2426
2425# ifdef HAVE_GNUTLS3 2427# ifdef HAVE_GNUTLS3
2426 capabilities = Fcons (intern("gnutls3"), capabilities); 2428 capabilities = Fcons (intern("gnutls3"), capabilities);
2427 capabilities = Fcons (intern("digests"), capabilities); 2429 capabilities = Fcons (intern("digests"), capabilities);