diff options
| author | Richard M. Stallman | 2005-07-23 19:09:09 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2005-07-23 19:09:09 +0000 |
| commit | 8f6bda75fb08ea6c84f12f3a16389f29ee81a7b5 (patch) | |
| tree | dcf0e81bfc71c57d2ac0dddedb1ed7f7379e5130 /src | |
| parent | 9bd32d8c95fcf3167ab970890fb101eb38be3cd9 (diff) | |
| download | emacs-8f6bda75fb08ea6c84f12f3a16389f29ee81a7b5.tar.gz emacs-8f6bda75fb08ea6c84f12f3a16389f29ee81a7b5.zip | |
(Feval, Ffuncall): Test gc_cons_threshold and
gc_relative_threshold, one by one.
Diffstat (limited to 'src')
| -rw-r--r-- | src/eval.c | 6 |
1 files changed, 4 insertions, 2 deletions
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, | |||
| 2094 | return form; | 2094 | return form; |
| 2095 | 2095 | ||
| 2096 | QUIT; | 2096 | QUIT; |
| 2097 | if (consing_since_gc > gc_cons_combined_threshold) | 2097 | if (consing_since_gc > gc_cons_threshold |
| 2098 | && consing_since_gc > gc_relative_threshold) | ||
| 2098 | { | 2099 | { |
| 2099 | GCPRO1 (form); | 2100 | GCPRO1 (form); |
| 2100 | Fgarbage_collect (); | 2101 | Fgarbage_collect (); |
| @@ -2794,7 +2795,8 @@ usage: (funcall FUNCTION &rest ARGUMENTS) */) | |||
| 2794 | register int i; | 2795 | register int i; |
| 2795 | 2796 | ||
| 2796 | QUIT; | 2797 | QUIT; |
| 2797 | if (consing_since_gc > gc_cons_combined_threshold) | 2798 | if (consing_since_gc > gc_cons_threshold |
| 2799 | && consing_since_gc > gc_relative_threshold) | ||
| 2798 | Fgarbage_collect (); | 2800 | Fgarbage_collect (); |
| 2799 | 2801 | ||
| 2800 | if (++lisp_eval_depth > max_lisp_eval_depth) | 2802 | if (++lisp_eval_depth > max_lisp_eval_depth) |