aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8a0d8863548..8713d493dca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12013-10-03 Paul Eggert <eggert@cs.ucla.edu> 12013-10-03 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Adjust to merge from gnulib.
4 * conf_post.h (__has_builtin, assume): Remove; gnulib now does these.
5 * lisp.h: Include <verify.h>, for 'assume'.
6
3 * eval.c (clobbered_eassert): New macro. 7 * eval.c (clobbered_eassert): New macro.
4 (internal_catch, internal_condition_case) 8 (internal_catch, internal_condition_case)
5 (internal_condition_case_1, internal_condition_case_2) 9 (internal_condition_case_1, internal_condition_case_2)