aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/alloc.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8e5c9d05b4e..f27a762b210 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12005-10-29 Chong Yidong <cyd@stupidchicken.com>
2
3 * alloc.c (emacs_blocked_free): Fix typo.
4
12005-10-29 Richard M. Stallman <rms@gnu.org> 52005-10-29 Richard M. Stallman <rms@gnu.org>
2 6
3 * xdisp.c (handle_fontified_prop): Do nothing if memory full. 7 * xdisp.c (handle_fontified_prop): Do nothing if memory full.
diff --git a/src/alloc.c b/src/alloc.c
index b18e313fc87..90ef4ba4e81 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1180,7 +1180,7 @@ emacs_blocked_free (ptr, ptr2)
1180 is substantially larger than the block size malloc uses. */ 1180 is substantially larger than the block size malloc uses. */
1181 && (bytes_used_when_full 1181 && (bytes_used_when_full
1182 > ((bytes_used_now = BYTES_USED) 1182 > ((bytes_used_now = BYTES_USED)
1183 + max (malloc_hysteresis, 4) * SPARE_MEMORY)) 1183 + max (malloc_hysteresis, 4) * SPARE_MEMORY)))
1184 refill_memory_reserve (); 1184 refill_memory_reserve ();
1185 1185
1186 __free_hook = emacs_blocked_free; 1186 __free_hook = emacs_blocked_free;