summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-06-02 01:40:41 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-06-02 01:40:41 -0700
commit57f53182c004f51e47818d70968a07579440eaff (patch)
treed72c39a7aa28f67bc63d8153df49c94d7b03bea0 /src
parent7f5efba80e3643683eb050205054b7896342aa2d (diff)
downloademacs-57f53182c004f51e47818d70968a07579440eaff.tar.gz
Merge ChangeLog from trunk better.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog32
1 files changed, 16 insertions, 16 deletions
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 <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):
@@ -81,22 +97,6 @@
2011-05-31 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.
-
Use 'inline', not 'INLINE'.
<http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00914.html>
* alloc.c, fontset.c (INLINE): Remove.