Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 474-484)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 88-91)

   - Merge from emacs--cvs-trunk--0
   - Update FSF's address in GPL notices
   - Update from CVS

1 files changed, 7 insertions, 7 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index 42b2cdfd635..580fdc67119 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -355,13 +355,13 @@ unmark_byte_stack ()
 /* Garbage collect if we have consed enough since the last time.
    We do this at every branch, to avoid loops that never GC.  */
 
-#define MAYBE_GC()                              \
-  if (consing_since_gc > gc_cons_threshold)     \
-    {                                           \
-      BEFORE_POTENTIAL_GC ();                   \
-      Fgarbage_collect ();                      \
-      AFTER_POTENTIAL_GC ();                    \
-    }                                           \
+#define MAYBE_GC()                                   \
+  if (consing_since_gc > gc_cons_combined_threshold) \
+    {                                                \
+      BEFORE_POTENTIAL_GC ();                        \
+      Fgarbage_collect ();                           \
+      AFTER_POTENTIAL_GC ();                         \
+    }                                                \
   else
 
 /* Check for jumping out of range.  */