From 57f53182c004f51e47818d70968a07579440eaff Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 2 Jun 2011 01:40:41 -0700 Subject: [PATCH] Merge ChangeLog from trunk better. --- ChangeLog | 7 ------- src/ChangeLog | 32 ++++++++++++++++---------------- 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76bd252b1ea..c0e5329964e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,13 +4,6 @@ 2011-05-30 Paul Eggert - Malloc failure behavior now depends on size of allocation. - * lib/allocator.h (struct allocator.die): New size arg. - * lib/careadlinkat.c (careadlinkat): Pass size to 'die' function. - If the actual problem is an ssize_t limitation, not a size_t or - malloc failure, fail with errno == ENAMETOOLONG instead of calling - 'die'. (Bug#8762) - Use 'inline', not 'INLINE'. * configure.in (INLINE): Remove. diff --git a/src/ChangeLog b/src/ChangeLog index 7d372e0448a..45d8e38738a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,21 @@ 2011-06-02 Paul Eggert + Malloc failure behavior now depends on size of allocation. + * alloc.c (buffer_memory_full, memory_full): New arg NBYTES. + * lisp.h: Change signatures accordingly. + * alloc.c, buffer.c, editfns.c, menu.c, minibuf.c, xterm.c: + All callers changed. (Bug#8762) + + * gnutls.c: Use Emacs's memory allocators. + Without this change, the gnutls library would invoke malloc etc. + directly, which causes problems on non-SYNC_INPUT hosts, and which + runs afoul of improving memory_full behavior. (Bug#8761) + (fn_gnutls_global_set_mem_functions): New macro or function pointer. + (emacs_gnutls_global_init): Use it to specify xmalloc, xrealloc, + xfree instead of the default malloc, realloc, free. + (Fgnutls_boot): No need to check for memory allocation failure, + since xmalloc does that for us. + Remove arbitrary limit of 2**31 entries in hash tables. (Bug#8771) * category.c (hash_get_category_set): * ccl.c (ccl_driver): @@ -81,22 +97,6 @@ 2011-05-31 Paul Eggert - Malloc failure behavior now depends on size of allocation. - * alloc.c (buffer_memory_full, memory_full): New arg NBYTES. - * lisp.h: Change signatures accordingly. - * alloc.c, buffer.c, editfns.c, menu.c, minibuf.c, xterm.c: - All callers changed. (Bug#8762) - - * gnutls.c: Use Emacs's memory allocators. - Without this change, the gnutls library would invoke malloc etc. - directly, which causes problems on non-SYNC_INPUT hosts, and which - runs afoul of improving memory_full behavior. (Bug#8761) - (fn_gnutls_global_set_mem_functions): New macro or function pointer. - (emacs_gnutls_global_init): Use it to specify xmalloc, xrealloc, - xfree instead of the default malloc, realloc, free. - (Fgnutls_boot): No need to check for memory allocation failure, - since xmalloc does that for us. - Use 'inline', not 'INLINE'. * alloc.c, fontset.c (INLINE): Remove. -- 2.11.4.GIT