From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 23 Jul 2005 19:09:09 +0000 (+0000)
Subject: (Feval, Ffuncall): Test gc_cons_threshold and
X-Git-Tag: emacs-pretest-22.0.90~7895
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8f6bda75fb08ea6c84f12f3a16389f29ee81a7b5;p=emacs.git

(Feval, Ffuncall): Test gc_cons_threshold and
gc_relative_threshold, one by one.
---

diff --git a/src/eval.c b/src/eval.c
index 26d1ce967a7..d118a30804c 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)