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)

diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index 0ad48b0b9ec7b8288664ef00e7a6168a3347c877..92846a924c504fbc238bc09eacb1ece5dc4100a9 100644 (file)
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -94,7 +94,11 @@ There's one way to find out if GnuTLS is available, by calling
 Zaretskii) in the same directory as Emacs, you should be OK.
 
 @defun gnutls-available-p
-This function returns @code{t} if GnuTLS is available in this instance of Emacs.
+This function returns non-@code{nil} if GnuTLS is available in this
+instance of Emacs, @code{nil} otherwise.  If GnuTLS is available, the
+value is a list of GnuTLS capabilities supported by the installed
+GnuTLS library, which depends on the library version.  The meaning of
+the capabilities is documented in the doc string of this function.
 @end defun
 
 Oh, but sometimes things go wrong.  Budgets aren't balanced,

diff --git a/etc/NEWS b/etc/NEWS
index 10e9a7f00f3c76da8a4c4c9302ba8c86d811dcfe..9853aa647a8e3107411cfff711727f10ae020d0a 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1535,6 +1535,10 @@ See the node "(elisp) Checksum/Hash" in the ELisp manual for details.
 and 'gnutls-symmetric-decrypt'.
 See the node "(elisp) GnuTLS Cryptography" in the ELisp manual for details.
 
++++
+** The function 'gnutls-available-p' now returns a list of capabilities
+supported by the GnuTLS library used by Emacs.
+
 +++
 ** Emacs now supports records for user-defined types, via the new
 functions 'make-record', 'record', and 'recordp'.  Records are now

diff --git a/src/gnutls.c b/src/gnutls.c
index 36f65c4acb33e3d9fe6e7f9dac3900fa6957b567..85cebd0e1c6dac287fa9865a909cc827e8e93463 100644 (file)
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -2422,6 +2422,8 @@ GnuTLS AEAD ciphers     : the list will contain `AEAD-ciphers'.  */)
 
 #ifdef HAVE_GNUTLS
 
+  capabilities = Fcons (intern("gnutls"), capabilities);
+
 # ifdef HAVE_GNUTLS3
   capabilities = Fcons (intern("gnutls3"), capabilities);
   capabilities = Fcons (intern("digests"), capabilities);