1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-15 11:21:19 -07:00

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

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 493-503)

   - Update from CVS
   - Update from CVS: lisp/startup.el (command-line): Fix typo.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 95-98)

   - Update from CVS
This commit is contained in:
Miles Bader 2005-07-29 01:54:54 +00:00
commit 58b646fafc
91 changed files with 3160 additions and 2018 deletions

View file

@ -355,13 +355,14 @@ 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_combined_threshold) \
{ \
BEFORE_POTENTIAL_GC (); \
Fgarbage_collect (); \
AFTER_POTENTIAL_GC (); \
} \
#define MAYBE_GC() \
if (consing_since_gc > gc_cons_threshold \
&& consing_since_gc > gc_relative_threshold) \
{ \
BEFORE_POTENTIAL_GC (); \
Fgarbage_collect (); \
AFTER_POTENTIAL_GC (); \
} \
else
/* Check for jumping out of range. */