diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2005-10-29 20:17:48 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2005-10-29 20:17:48 +0000 |
| commit | bccfb31031b10ac2de02bf061516fd8fbdf6d56b (patch) | |
| tree | 40dd834e5ad0795e6b7c4ddd044df6d48e11c393 | |
| parent | 685abb980b4cfb13bc2c7a054bb3090910c05e8f (diff) | |
| download | emacs-bccfb31031b10ac2de02bf061516fd8fbdf6d56b.tar.gz | |
* alloc.c (emacs_blocked_free): Fix typo.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/alloc.c | 2 |
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 @@ +2005-10-29 Chong Yidong <cyd@stupidchicken.com> + + * alloc.c (emacs_blocked_free): Fix typo. + 2005-10-29 Richard M. Stallman <rms@gnu.org> * 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) is substantially larger than the block size malloc uses. */ && (bytes_used_when_full > ((bytes_used_now = BYTES_USED) - + max (malloc_hysteresis, 4) * SPARE_MEMORY)) + + max (malloc_hysteresis, 4) * SPARE_MEMORY))) refill_memory_reserve (); __free_hook = emacs_blocked_free; |