aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fc4f31028ea..73c67125257 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,11 +1,15 @@
12012-04-13 Atsuo Ohki <ohki@gssm.otsuka.tsukuba.ac.jp> (tiny change)
2
3 * lread.c (lisp_file_lexically_bound_p): Fix hang at ";-*-\n" (bug#11238).
4
12012-04-10 Teodor Zlatanov <tzz@lifelogs.com> 52012-04-10 Teodor Zlatanov <tzz@lifelogs.com>
2 6
3 * process.c (make_process): 7 * process.c (make_process):
4 * process.h: Add integer `gnutls_handshakes_tried' member to 8 * process.h: Add integer `gnutls_handshakes_tried' member to
5 process struct. 9 process struct.
6 10
7 * gnutls.h: Add `GNUTLS_EMACS_HANDSHAKES_LIMIT' upper limit. Add 11 * gnutls.h: Add `GNUTLS_EMACS_HANDSHAKES_LIMIT' upper limit.
8 convenience `GNUTLS_LOG2i' macro. 12 Add convenience `GNUTLS_LOG2i' macro.
9 13
10 * gnutls.c (gnutls_log_function2i): Convenience log function. 14 * gnutls.c (gnutls_log_function2i): Convenience log function.
11 (emacs_gnutls_read): Use new log functions, 15 (emacs_gnutls_read): Use new log functions,