Commit 331379bf authored by Juanma Barranquero's avatar Juanma Barranquero

Rename BINDING_STACK_SIZE to SPECPDL_INDEX.

parent c929397d
...@@ -4048,7 +4048,7 @@ Garbage collection happens automatically if you cons more than ...@@ -4048,7 +4048,7 @@ Garbage collection happens automatically if you cons more than
register int i; register int i;
int message_p; int message_p;
Lisp_Object total[8]; Lisp_Object total[8];
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
/* Can't GC if pure storage overflowed because we can't determine /* Can't GC if pure storage overflowed because we can't determine
if something is a pure object or not. */ if something is a pure object or not. */
......
...@@ -2057,7 +2057,7 @@ You must run Emacs in batch mode in order to dump it. */) ...@@ -2057,7 +2057,7 @@ You must run Emacs in batch mode in order to dump it. */)
extern char my_edata[]; extern char my_edata[];
Lisp_Object tem; Lisp_Object tem;
Lisp_Object symbol; Lisp_Object symbol;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
check_pure_size (); check_pure_size ();
......
...@@ -3588,7 +3588,7 @@ actually used. */) ...@@ -3588,7 +3588,7 @@ actually used. */)
int inserted = 0; int inserted = 0;
register int how_much; register int how_much;
register int unprocessed; register int unprocessed;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
Lisp_Object handler, val, insval, orig_filename; Lisp_Object handler, val, insval, orig_filename;
Lisp_Object p; Lisp_Object p;
......
...@@ -2162,7 +2162,7 @@ enabled such bindings for that variable with `make-variable-frame-local'. */) ...@@ -2162,7 +2162,7 @@ enabled such bindings for that variable with `make-variable-frame-local'. */)
{ {
FRAME_PTR f; FRAME_PTR f;
register Lisp_Object tail, prop, val; register Lisp_Object tail, prop, val;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
/* Bind this to t to inhibit initialization of the default face from /* Bind this to t to inhibit initialization of the default face from
X resources in face-set-after-frame-default. If we don't inhibit X resources in face-set-after-frame-default. If we don't inhibit
......
...@@ -2090,7 +2090,7 @@ show_help_echo (help, window, object, pos, ok_to_overwrite_keystroke_echo) ...@@ -2090,7 +2090,7 @@ show_help_echo (help, window, object, pos, ok_to_overwrite_keystroke_echo)
{ {
if (STRINGP (help)) if (STRINGP (help))
{ {
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
if (!help_echo_showing_p) if (!help_echo_showing_p)
Vpre_help_message = current_message (); Vpre_help_message = current_message ();
...@@ -4204,7 +4204,7 @@ timer_check (do_it_now) ...@@ -4204,7 +4204,7 @@ timer_check (do_it_now)
if (NILP (vector[0])) if (NILP (vector[0]))
{ {
int was_locked = single_kboard; int was_locked = single_kboard;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
Lisp_Object old_deactivate_mark = Vdeactivate_mark; Lisp_Object old_deactivate_mark = Vdeactivate_mark;
/* Mark the timer as triggered to prevent problems if the lisp /* Mark the timer as triggered to prevent problems if the lisp
...@@ -9517,7 +9517,7 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_ ...@@ -9517,7 +9517,7 @@ DEFUN ("execute-extended-command", Fexecute_extended_command, Sexecute_extended_
Lisp_Object binding; Lisp_Object binding;
char *newmessage; char *newmessage;
int message_p = push_message (); int message_p = push_message ();
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
record_unwind_protect (push_message_unwind, Qnil); record_unwind_protect (push_message_unwind, Qnil);
binding = Fkey_description (bindings); binding = Fkey_description (bindings);
......
...@@ -3825,7 +3825,7 @@ This function is an internal primitive--use `make-frame' instead. */) ...@@ -3825,7 +3825,7 @@ This function is an internal primitive--use `make-frame' instead. */)
int minibuffer_only = 0; int minibuffer_only = 0;
long window_prompting = 0; long window_prompting = 0;
int width, height; int width, height;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
Lisp_Object display; Lisp_Object display;
struct mac_display_info *dpyinfo = NULL; struct mac_display_info *dpyinfo = NULL;
...@@ -9750,7 +9750,7 @@ Value is t is tooltip was open, nil otherwise. */) ...@@ -9750,7 +9750,7 @@ Value is t is tooltip was open, nil otherwise. */)
GCPRO2 (frame, timer); GCPRO2 (frame, timer);
tip_frame = tip_timer = deleted = Qnil; tip_frame = tip_timer = deleted = Qnil;
count = BINDING_STACK_SIZE (); count = SPECPDL_INDEX ();
specbind (Qinhibit_redisplay, Qt); specbind (Qinhibit_redisplay, Qt);
specbind (Qinhibit_quit, Qt); specbind (Qinhibit_quit, Qt);
......
...@@ -565,7 +565,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag, ...@@ -565,7 +565,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
/* Erase the buffer. */ /* Erase the buffer. */
{ {
int count1 = BINDING_STACK_SIZE (); int count1 = SPECPDL_INDEX ();
specbind (Qinhibit_read_only, Qt); specbind (Qinhibit_read_only, Qt);
specbind (Qinhibit_modification_hooks, Qt); specbind (Qinhibit_modification_hooks, Qt);
Ferase_buffer (); Ferase_buffer ();
......
...@@ -399,7 +399,7 @@ Return what remains of the list. */) ...@@ -399,7 +399,7 @@ Return what remains of the list. */)
{ {
struct gcpro gcpro1, gcpro2; struct gcpro gcpro1, gcpro2;
Lisp_Object next; Lisp_Object next;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
register int arg; register int arg;
#if 0 /* This is a good feature, but would make undo-start #if 0 /* This is a good feature, but would make undo-start
......
...@@ -5498,7 +5498,7 @@ This function is an internal primitive--use `make-frame' instead. */) ...@@ -5498,7 +5498,7 @@ This function is an internal primitive--use `make-frame' instead. */)
int minibuffer_only = 0; int minibuffer_only = 0;
long window_prompting = 0; long window_prompting = 0;
int width, height; int width, height;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
Lisp_Object display; Lisp_Object display;
struct w32_display_info *dpyinfo = NULL; struct w32_display_info *dpyinfo = NULL;
...@@ -13657,7 +13657,7 @@ x_create_tip_frame (dpyinfo, parms, text) ...@@ -13657,7 +13657,7 @@ x_create_tip_frame (dpyinfo, parms, text)
Lisp_Object name; Lisp_Object name;
long window_prompting = 0; long window_prompting = 0;
int width, height; int width, height;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
struct gcpro gcpro1, gcpro2, gcpro3; struct gcpro gcpro1, gcpro2, gcpro3;
struct kboard *kb; struct kboard *kb;
int face_change_count_before = face_change_count; int face_change_count_before = face_change_count;
...@@ -13997,7 +13997,7 @@ Text larger than the specified size is clipped. */) ...@@ -13997,7 +13997,7 @@ Text larger than the specified size is clipped. */)
int i, width, height; int i, width, height;
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
int old_windows_or_buffers_changed = windows_or_buffers_changed; int old_windows_or_buffers_changed = windows_or_buffers_changed;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
specbind (Qinhibit_redisplay, Qt); specbind (Qinhibit_redisplay, Qt);
...@@ -14228,7 +14228,7 @@ Value is t if tooltip was open, nil otherwise. */) ...@@ -14228,7 +14228,7 @@ Value is t if tooltip was open, nil otherwise. */)
GCPRO2 (frame, timer); GCPRO2 (frame, timer);
tip_frame = tip_timer = deleted = Qnil; tip_frame = tip_timer = deleted = Qnil;
count = BINDING_STACK_SIZE (); count = SPECPDL_INDEX ();
specbind (Qinhibit_redisplay, Qt); specbind (Qinhibit_redisplay, Qt);
specbind (Qinhibit_quit, Qt); specbind (Qinhibit_quit, Qt);
......
...@@ -4398,7 +4398,7 @@ scroll_command (n, direction) ...@@ -4398,7 +4398,7 @@ scroll_command (n, direction)
Lisp_Object n; Lisp_Object n;
int direction; int direction;
{ {
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
xassert (abs (direction) == 1); xassert (abs (direction) == 1);
...@@ -4512,7 +4512,7 @@ showing that buffer, popping the buffer up if necessary. */) ...@@ -4512,7 +4512,7 @@ showing that buffer, popping the buffer up if necessary. */)
{ {
Lisp_Object window; Lisp_Object window;
struct window *w; struct window *w;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
window = Fother_window_for_scrolling (); window = Fother_window_for_scrolling ();
w = XWINDOW (window); w = XWINDOW (window);
......
...@@ -1328,7 +1328,7 @@ safe_eval (sexpr) ...@@ -1328,7 +1328,7 @@ safe_eval (sexpr)
val = Qnil; val = Qnil;
else else
{ {
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
struct gcpro gcpro1; struct gcpro gcpro1;
GCPRO1 (sexpr); GCPRO1 (sexpr);
...@@ -1360,7 +1360,7 @@ safe_call (nargs, args) ...@@ -1360,7 +1360,7 @@ safe_call (nargs, args)
val = Qnil; val = Qnil;
else else
{ {
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
struct gcpro gcpro1; struct gcpro gcpro1;
GCPRO1 (args[0]); GCPRO1 (args[0]);
...@@ -2241,7 +2241,7 @@ handle_fontified_prop (it) ...@@ -2241,7 +2241,7 @@ handle_fontified_prop (it)
prop = Fget_char_property (pos, Qfontified, Qnil), prop = Fget_char_property (pos, Qfontified, Qnil),
NILP (prop))) NILP (prop)))
{ {
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
Lisp_Object val; Lisp_Object val;
val = Vfontification_functions; val = Vfontification_functions;
...@@ -2864,7 +2864,7 @@ handle_single_display_prop (it, prop, object, position, ...@@ -2864,7 +2864,7 @@ handle_single_display_prop (it, prop, object, position,
if (!NILP (form) && !EQ (form, Qt)) if (!NILP (form) && !EQ (form, Qt))
{ {
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
struct gcpro gcpro1; struct gcpro gcpro1;
/* Bind `object' to the object having the `display' property, a /* Bind `object' to the object having the `display' property, a
...@@ -2935,7 +2935,7 @@ handle_single_display_prop (it, prop, object, position, ...@@ -2935,7 +2935,7 @@ handle_single_display_prop (it, prop, object, position,
/* Evaluate IT->font_height with `height' bound to the /* Evaluate IT->font_height with `height' bound to the
current specified height to get the new height. */ current specified height to get the new height. */
Lisp_Object value; Lisp_Object value;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]); specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]);
value = safe_eval (it->font_height); value = safe_eval (it->font_height);
...@@ -6271,7 +6271,7 @@ with_echo_area_buffer (w, which, fn, a1, a2, a3, a4) ...@@ -6271,7 +6271,7 @@ with_echo_area_buffer (w, which, fn, a1, a2, a3, a4)
{ {
Lisp_Object buffer; Lisp_Object buffer;
int this_one, the_other, clear_buffer_p, rc; int this_one, the_other, clear_buffer_p, rc;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
/* If buffers aren't live, make new ones. */ /* If buffers aren't live, make new ones. */
ensure_echo_area_buffers (); ensure_echo_area_buffers ();
...@@ -6446,7 +6446,7 @@ setup_echo_area_for_printing (multibyte_p) ...@@ -6446,7 +6446,7 @@ setup_echo_area_for_printing (multibyte_p)
if (Z > BEG) if (Z > BEG)
{ {
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
specbind (Qinhibit_read_only, Qt); specbind (Qinhibit_read_only, Qt);
del_range (BEG, Z); del_range (BEG, Z);
unbind_to (count, Qnil); unbind_to (count, Qnil);
...@@ -7126,7 +7126,7 @@ echo_area_display (update_frame_p) ...@@ -7126,7 +7126,7 @@ echo_area_display (update_frame_p)
/* Must update other windows. Likewise as in other /* Must update other windows. Likewise as in other
cases, don't let this update be interrupted by cases, don't let this update be interrupted by
pending input. */ pending input. */
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
specbind (Qredisplay_dont_pause, Qt); specbind (Qredisplay_dont_pause, Qt);
windows_or_buffers_changed = 1; windows_or_buffers_changed = 1;
redisplay_internal (0); redisplay_internal (0);
...@@ -7359,7 +7359,7 @@ prepare_menu_bars () ...@@ -7359,7 +7359,7 @@ prepare_menu_bars ()
if (all_windows) if (all_windows)
{ {
Lisp_Object tail, frame; Lisp_Object tail, frame;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
...@@ -7477,7 +7477,7 @@ update_menu_bar (f, save_match_data) ...@@ -7477,7 +7477,7 @@ update_menu_bar (f, save_match_data)
!= !NILP (w->region_showing))) != !NILP (w->region_showing)))
{ {
struct buffer *prev = current_buffer; struct buffer *prev = current_buffer;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
specbind (Qinhibit_menubar_update, Qt); specbind (Qinhibit_menubar_update, Qt);
...@@ -7571,7 +7571,7 @@ update_tool_bar (f, save_match_data) ...@@ -7571,7 +7571,7 @@ update_tool_bar (f, save_match_data)
!= !NILP (w->region_showing))) != !NILP (w->region_showing)))
{ {
struct buffer *prev = current_buffer; struct buffer *prev = current_buffer;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
/* Set current_buffer to the buffer of the selected /* Set current_buffer to the buffer of the selected
window of the frame, so that we get the right local window of the frame, so that we get the right local
...@@ -8504,7 +8504,7 @@ redisplay_internal (preserve_echo_area) ...@@ -8504,7 +8504,7 @@ redisplay_internal (preserve_echo_area)
/* Record a function that resets redisplaying_p to its old value /* Record a function that resets redisplaying_p to its old value
when we leave this function. */ when we leave this function. */
count = BINDING_STACK_SIZE (); count = SPECPDL_INDEX ();
record_unwind_protect (unwind_redisplay, make_number (redisplaying_p)); record_unwind_protect (unwind_redisplay, make_number (redisplaying_p));
++redisplaying_p; ++redisplaying_p;
...@@ -10090,7 +10090,7 @@ redisplay_window (window, just_this_one_p) ...@@ -10090,7 +10090,7 @@ redisplay_window (window, just_this_one_p)
/* Record it now because it's overwritten. */ /* Record it now because it's overwritten. */
int current_matrix_up_to_date_p = 0; int current_matrix_up_to_date_p = 0;
int temp_scroll_step = 0; int temp_scroll_step = 0;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
int rc; int rc;
int centering_position; int centering_position;
......
...@@ -6304,7 +6304,7 @@ try_alternative_families (f, family, registry, fonts) ...@@ -6304,7 +6304,7 @@ try_alternative_families (f, family, registry, fonts)
/* Try scalable fonts before giving up. */ /* Try scalable fonts before giving up. */
if (nfonts == 0 && NILP (Vscalable_fonts_allowed)) if (nfonts == 0 && NILP (Vscalable_fonts_allowed))
{ {
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
specbind (Qscalable_fonts_allowed, Qt); specbind (Qscalable_fonts_allowed, Qt);
nfonts = try_alternative_families (f, family, registry, fonts); nfonts = try_alternative_families (f, family, registry, fonts);
unbind_to (count, Qnil); unbind_to (count, Qnil);
...@@ -6450,7 +6450,7 @@ realize_basic_faces (f) ...@@ -6450,7 +6450,7 @@ realize_basic_faces (f)
struct frame *f; struct frame *f;
{ {
int success_p = 0; int success_p = 0;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
/* Block input here so that we won't be surprised by an X expose /* Block input here so that we won't be surprised by an X expose
event, for instance, without having the faces set up. */ event, for instance, without having the faces set up. */
......
...@@ -4299,7 +4299,7 @@ This function is an internal primitive--use `make-frame' instead. */) ...@@ -4299,7 +4299,7 @@ This function is an internal primitive--use `make-frame' instead. */)
int minibuffer_only = 0; int minibuffer_only = 0;
long window_prompting = 0; long window_prompting = 0;
int width, height; int width, height;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
Lisp_Object display; Lisp_Object display;
struct x_display_info *dpyinfo = NULL; struct x_display_info *dpyinfo = NULL;
...@@ -10932,7 +10932,7 @@ x_create_tip_frame (dpyinfo, parms, text) ...@@ -10932,7 +10932,7 @@ x_create_tip_frame (dpyinfo, parms, text)
Lisp_Object name; Lisp_Object name;
long window_prompting = 0; long window_prompting = 0;
int width, height; int width, height;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
struct gcpro gcpro1, gcpro2, gcpro3; struct gcpro gcpro1, gcpro2, gcpro3;
struct kboard *kb; struct kboard *kb;
int face_change_count_before = face_change_count; int face_change_count_before = face_change_count;
...@@ -11323,7 +11323,7 @@ Text larger than the specified size is clipped. */) ...@@ -11323,7 +11323,7 @@ Text larger than the specified size is clipped. */)
int i, width, height; int i, width, height;
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
int old_windows_or_buffers_changed = windows_or_buffers_changed; int old_windows_or_buffers_changed = windows_or_buffers_changed;
int count = BINDING_STACK_SIZE (); int count = SPECPDL_INDEX ();
specbind (Qinhibit_redisplay, Qt); specbind (Qinhibit_redisplay, Qt);
...@@ -11516,7 +11516,7 @@ Value is t if tooltip was open, nil otherwise. */) ...@@ -11516,7 +11516,7 @@ Value is t if tooltip was open, nil otherwise. */)
GCPRO2 (frame, timer); GCPRO2 (frame, timer);
tip_frame = tip_timer = deleted = Qnil; tip_frame = tip_timer = deleted = Qnil;
count = BINDING_STACK_SIZE (); count = SPECPDL_INDEX ();
specbind (Qinhibit_redisplay, Qt); specbind (Qinhibit_redisplay, Qt);
specbind (Qinhibit_quit, Qt); specbind (Qinhibit_quit, Qt);
......
...@@ -786,7 +786,7 @@ x_handle_selection_request (event) ...@@ -786,7 +786,7 @@ x_handle_selection_request (event)
} }
x_selection_current_request = event; x_selection_current_request = event;
count = BINDING_STACK_SIZE (); count = SPECPDL_INDEX ();
selection_request_dpyinfo = dpyinfo; selection_request_dpyinfo = dpyinfo;
record_unwind_protect (x_selection_request_lisp_error, Qnil); record_unwind_protect (x_selection_request_lisp_error, Qnil);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment