aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>2005-07-23 19:09:09 +0000
committerRichard M. Stallman <[email protected]>2005-07-23 19:09:09 +0000
commit8f6bda75fb08ea6c84f12f3a16389f29ee81a7b5 (patch)
treedcf0e81bfc71c57d2ac0dddedb1ed7f7379e5130
parent9bd32d8c95fcf3167ab970890fb101eb38be3cd9 (diff)
(Feval, Ffuncall): Test gc_cons_threshold and
gc_relative_threshold, one by one.
-rw-r--r--src/eval.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c
index 26d1ce967a..d118a30804 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2094,7 +2094,8 @@ DEFUN ("eval", Feval, Seval, 1, 1, 0,
return form;
QUIT;
- if (consing_since_gc > gc_cons_combined_threshold)
+ if (consing_since_gc > gc_cons_threshold
+ && consing_since_gc > gc_relative_threshold)
{
GCPRO1 (form);
Fgarbage_collect ();
@@ -2794,7 +2795,8 @@ usage: (funcall FUNCTION &rest ARGUMENTS) */)
register int i;
QUIT;
- if (consing_since_gc > gc_cons_combined_threshold)
+ if (consing_since_gc > gc_cons_threshold
+ && consing_since_gc > gc_relative_threshold)
Fgarbage_collect ();
if (++lisp_eval_depth > max_lisp_eval_depth)