aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorTed Zlatanov2014-12-11 17:55:36 -0500
committerTed Zlatanov2014-12-11 17:55:36 -0500
commit301a4014a72964a8ec0078055c273d045d94fe42 (patch)
tree56624b7953a40c098299261e283fc33200d5f21e /src/ChangeLog
parentd76b9b2a213fa4e2c812a2c2503b4bfa4c28ece8 (diff)
downloademacs-301a4014a72964a8ec0078055c273d045d94fe42.tar.gz
emacs-301a4014a72964a8ec0078055c273d045d94fe42.zip
Always define `gnutls-available-p' even if GnuTLS is not available.
Fixes: debbugs:19346 * gnutls.c (Fgnutls_available_p syms_of_gnutls): Move later for clarity. Let the availability check return Qnil when the GnuTLS integration is not available, instead of erroring out. * gnutls.h: Always declare syms_of_gnutls. * emacs.c (main): Always include gnutls.h and run syms_of_gnutls.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b8663bcf7c0..90139535e30 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
12014-12-11 Teodor Zlatanov <tzz@lifelogs.com>
2
3 * emacs.c (main): Always include gnutls.h and run syms_of_gnutls.
4
5 * gnutls.h: Always declare syms_of_gnutls.
6
7 * gnutls.c (Fgnutls_available_p syms_of_gnutls): Move later for
8 clarity. Let the availability check return Qnil when the GnuTLS
9 integration is not available, instead of erroring out.
10 (Bug#19346)
11
12014-12-10 Eli Zaretskii <eliz@gnu.org> 122014-12-10 Eli Zaretskii <eliz@gnu.org>
2 13
3 * xdisp.c (move_it_in_display_line_to, display_line): Don't 14 * xdisp.c (move_it_in_display_line_to, display_line): Don't