diff options
| author | Miles Bader | 2005-07-29 01:54:54 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-07-29 01:54:54 +0000 |
| commit | 58b646fafc27ea5fb93fa95d5ff84187d689d315 (patch) | |
| tree | 361704f8149dccf6d1578bea3b89da11ced846f7 /src/bytecode.c | |
| parent | ffc3bd5c6c5ce65d4390c3523e4527c701a0ed95 (diff) | |
| parent | d44e3b453c528446579182d82284abbfd80f8b7d (diff) | |
| download | emacs-58b646fafc27ea5fb93fa95d5ff84187d689d315.tar.gz emacs-58b646fafc27ea5fb93fa95d5ff84187d689d315.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-74
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 493-503)
- Update from CVS
- Update from CVS: lisp/startup.el (command-line): Fix typo.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 95-98)
- Update from CVS
Diffstat (limited to 'src/bytecode.c')
| -rw-r--r-- | src/bytecode.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index 580fdc67119..c9ab56b18d1 100644 --- a/src/bytecode.c +++ b/src/bytecode.c | |||
| @@ -355,13 +355,14 @@ unmark_byte_stack () | |||
| 355 | /* Garbage collect if we have consed enough since the last time. | 355 | /* Garbage collect if we have consed enough since the last time. |
| 356 | We do this at every branch, to avoid loops that never GC. */ | 356 | We do this at every branch, to avoid loops that never GC. */ |
| 357 | 357 | ||
| 358 | #define MAYBE_GC() \ | 358 | #define MAYBE_GC() \ |
| 359 | if (consing_since_gc > gc_cons_combined_threshold) \ | 359 | if (consing_since_gc > gc_cons_threshold \ |
| 360 | { \ | 360 | && consing_since_gc > gc_relative_threshold) \ |
| 361 | BEFORE_POTENTIAL_GC (); \ | 361 | { \ |
| 362 | Fgarbage_collect (); \ | 362 | BEFORE_POTENTIAL_GC (); \ |
| 363 | AFTER_POTENTIAL_GC (); \ | 363 | Fgarbage_collect (); \ |
| 364 | } \ | 364 | AFTER_POTENTIAL_GC (); \ |
| 365 | } \ | ||
| 365 | else | 366 | else |
| 366 | 367 | ||
| 367 | /* Check for jumping out of range. */ | 368 | /* Check for jumping out of range. */ |