mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 15:00:45 -08:00
Code Issues Projects Releases Wiki Activity

Merge from trunk

Browse source
This commit is contained in:
Stefan Monnier 2011-03-21 12:42:16 -04:00
commit cafdcef32d
250 changed files with 7207 additions and 3869 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/bytecode.c
View file

@ -76,11 +76,7 @@ Lisp_Object Qbyte_code_meter;
} \
}
#else /* no BYTE_CODE_METER */
#define METER_CODE(last_code, this_code)
#endif /* no BYTE_CODE_METER */
#endif /* BYTE_CODE_METER */
Lisp_Object Qbytecode;
@ -148,7 +144,9 @@ extern Lisp_Object Qand_optional, Qand_rest;
#define Bpreceding_char 0150
#define Bcurrent_column 0151
#define Bindent_to 0152
#ifdef BYTE_CODE_SAFE
#define Bscan_buffer 0153 /* No longer generated as of v18 */
#endif
#define Beolp 0154
#define Beobp 0155
#define Bbolp 0156
@ -156,8 +154,12 @@ extern Lisp_Object Qand_optional, Qand_rest;
#define Bcurrent_buffer 0160
#define Bset_buffer 0161
#define Bsave_current_buffer_1 0162 /* Replacing Bsave_current_buffer. */
#if 0
#define Bread_char 0162 /* No longer generated as of v19 */
#endif
#ifdef BYTE_CODE_SAFE
#define Bset_mark 0163 /* this loser is no longer generated as of v18 */
#endif
#define Binteractive_p 0164 /* Obsolete. */
#define Bforward_char 0165
@ -234,7 +236,6 @@ extern Lisp_Object Qand_optional, Qand_rest;
#define BdiscardN 0266
#define Bconstant 0300
#define CONSTANTLIM 0100
/* Whether to maintain a `top' and `bottom' field in the stack frame. */
#define BYTE_MAINTAIN_TOP (BYTE_CODE_SAFE || BYTE_MARK_STACK)
@ -370,6 +371,7 @@ unmark_byte_stack (void)
We do this at every branch, to avoid loops that never GC. */
#define MAYBE_GC() \
do { \
if (consing_since_gc > gc_cons_threshold \
&& consing_since_gc > gc_relative_threshold) \
{ \
@ -377,7 +379,7 @@ unmark_byte_stack (void)
Fgarbage_collect (); \
AFTER_POTENTIAL_GC (); \
} \
else
} while (0)
/* Check for jumping out of range. */