Merge: memory_full, gnutls improvements

1 files changed, 16 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 703976e4700..45d8e38738a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,21 @@
 2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>
 
+        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):