]> git.eshelyaron.com Git - emacs.git/commitdiff
(Feval, Ffuncall): Test gc_cons_threshold and
authorRichard M. Stallman <rms@gnu.org>
Sat, 23 Jul 2005 19:09:09 +0000 (19:09 +0000)
committerRichard M. Stallman <rms@gnu.org>
Sat, 23 Jul 2005 19:09:09 +0000 (19:09 +0000)
gc_relative_threshold, one by one.

src/eval.c

index 26d1ce967a733afd74bfb89af318e2afffc30e7d..d118a30804c1f7aad41de849f3928f3982b2036b 100644 (file)
@@ -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)