Mercurial > emacs

comparison src/xdisp.c @ 33600:c5f64497e92c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use BINDING_STACK_SIZE throughout.
author Gerd Moellmann <gerd@gnu.org>
date Sat, 18 Nov 2000 21:05:19 +0000
parents a4cd4c93196b
children c45f067779c1
comparison
equal deleted inserted replaced
33599:ef784855566b 33600:c5f64497e92c
1219 1219
1220 Lisp_Object 1220 Lisp_Object
1221 safe_eval (sexpr) 1221 safe_eval (sexpr)
1222 Lisp_Object sexpr; 1222 Lisp_Object sexpr;
1223 { 1223 {
1224 int count = specpdl_ptr - specpdl; 1224 int count = BINDING_STACK_SIZE ();
1225 struct gcpro gcpro1; 1225 struct gcpro gcpro1;
1226 Lisp_Object val; 1226 Lisp_Object val;
1227 1227
1228 GCPRO1 (sexpr); 1228 GCPRO1 (sexpr);
1229 specbind (Qinhibit_redisplay, Qt); 1229 specbind (Qinhibit_redisplay, Qt);
1239 Lisp_Object 1239 Lisp_Object
1240 safe_call (nargs, args) 1240 safe_call (nargs, args)
1241 int nargs; 1241 int nargs;
1242 Lisp_Object *args; 1242 Lisp_Object *args;
1243 { 1243 {
1244 int count = specpdl_ptr - specpdl; 1244 int count = BINDING_STACK_SIZE ();
1245 Lisp_Object val; 1245 Lisp_Object val;
1246 struct gcpro gcpro1; 1246 struct gcpro gcpro1;
1247 1247
1248 GCPRO1 (args[0]); 1248 GCPRO1 (args[0]);
1249 gcpro1.nvars = nargs; 1249 gcpro1.nvars = nargs;
2010 && !NILP (Vrun_hooks) 2010 && !NILP (Vrun_hooks)
2011 && (pos = make_number (IT_CHARPOS (*it)), 2011 && (pos = make_number (IT_CHARPOS (*it)),
2012 prop = Fget_char_property (pos, Qfontified, Qnil), 2012 prop = Fget_char_property (pos, Qfontified, Qnil),
2013 NILP (prop))) 2013 NILP (prop)))
2014 { 2014 {
2015 int count = specpdl_ptr - specpdl; 2015 int count = BINDING_STACK_SIZE ();
2016 Lisp_Object val; 2016 Lisp_Object val;
2017 2017
2018 val = Vfontification_functions; 2018 val = Vfontification_functions;
2019 specbind (Qfontification_functions, Qnil); 2019 specbind (Qfontification_functions, Qnil);
2020 specbind (Qafter_change_functions, Qnil); 2020 specbind (Qafter_change_functions, Qnil);
2639 else 2639 else
2640 { 2640 {
2641 /* Evaluate IT->font_height with `height' bound to the 2641 /* Evaluate IT->font_height with `height' bound to the
2642 current specified height to get the new height. */ 2642 current specified height to get the new height. */
2643 Lisp_Object value; 2643 Lisp_Object value;
2644 int count = specpdl_ptr - specpdl; 2644 int count = BINDING_STACK_SIZE ();
2645 2645
2646 specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]); 2646 specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]);
2647 value = safe_eval (it->font_height); 2647 value = safe_eval (it->font_height);
2648 unbind_to (count, Qnil); 2648 unbind_to (count, Qnil);
2649 2649
5783 Lisp_Object a2; 5783 Lisp_Object a2;
5784 EMACS_INT a3, a4; 5784 EMACS_INT a3, a4;
5785 { 5785 {
5786 Lisp_Object buffer; 5786 Lisp_Object buffer;
5787 int this_one, the_other, clear_buffer_p, rc; 5787 int this_one, the_other, clear_buffer_p, rc;
5788 int count = specpdl_ptr - specpdl; 5788 int count = BINDING_STACK_SIZE ();
5789 5789
5790 /* If buffers aren't life, make new ones. */ 5790 /* If buffers aren't life, make new ones. */
5791 ensure_echo_area_buffers (); 5791 ensure_echo_area_buffers ();
5792 5792
5793 clear_buffer_p = 0; 5793 clear_buffer_p = 0;
6808 || buffer_shared > 1 6808 || buffer_shared > 1
6809 || windows_or_buffers_changed); 6809 || windows_or_buffers_changed);
6810 if (all_windows) 6810 if (all_windows)
6811 { 6811 {
6812 Lisp_Object tail, frame; 6812 Lisp_Object tail, frame;
6813 int count = specpdl_ptr - specpdl; 6813 int count = BINDING_STACK_SIZE ();
6814 6814
6815 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); 6815 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
6816 6816
6817 FOR_EACH_FRAME (tail, frame) 6817 FOR_EACH_FRAME (tail, frame)
6818 { 6818 {
6912 || ((!NILP (Vtransient_mark_mode) 6912 || ((!NILP (Vtransient_mark_mode)
6913 && !NILP (XBUFFER (w->buffer)->mark_active)) 6913 && !NILP (XBUFFER (w->buffer)->mark_active))
6914 != !NILP (w->region_showing))) 6914 != !NILP (w->region_showing)))
6915 { 6915 {
6916 struct buffer *prev = current_buffer; 6916 struct buffer *prev = current_buffer;
6917 int count = specpdl_ptr - specpdl; 6917 int count = BINDING_STACK_SIZE ();
6918 6918
6919 set_buffer_internal_1 (XBUFFER (w->buffer)); 6919 set_buffer_internal_1 (XBUFFER (w->buffer));
6920 if (save_match_data) 6920 if (save_match_data)
6921 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil)); 6921 record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
6922 if (NILP (Voverriding_local_map_menu_flag)) 6922 if (NILP (Voverriding_local_map_menu_flag))
7004 || ((!NILP (Vtransient_mark_mode) 7004 || ((!NILP (Vtransient_mark_mode)
7005 && !NILP (XBUFFER (w->buffer)->mark_active)) 7005 && !NILP (XBUFFER (w->buffer)->mark_active))
7006 != !NILP (w->region_showing))) 7006 != !NILP (w->region_showing)))
7007 { 7007 {
7008 struct buffer *prev = current_buffer; 7008 struct buffer *prev = current_buffer;
7009 int count = specpdl_ptr - specpdl; 7009 int count = BINDING_STACK_SIZE ();
7010 7010
7011 /* Set current_buffer to the buffer of the selected 7011 /* Set current_buffer to the buffer of the selected
7012 window of the frame, so that we get the right local 7012 window of the frame, so that we get the right local
7013 keymaps. */ 7013 keymaps. */
7014 set_buffer_internal_1 (XBUFFER (w->buffer)); 7014 set_buffer_internal_1 (XBUFFER (w->buffer));
7792 if (redisplaying_p) 7792 if (redisplaying_p)
7793 return; 7793 return;
7794 7794
7795 /* Record a function that resets redisplaying_p to its old value 7795 /* Record a function that resets redisplaying_p to its old value
7796 when we leave this function. */ 7796 when we leave this function. */
7797 count = specpdl_ptr - specpdl; 7797 count = BINDING_STACK_SIZE ();
7798 record_unwind_protect (unwind_redisplay, make_number (redisplaying_p)); 7798 record_unwind_protect (unwind_redisplay, make_number (redisplaying_p));
7799 ++redisplaying_p; 7799 ++redisplaying_p;
7800 7800
7801 retry: 7801 retry:
7802 pause = 0; 7802 pause = 0;
9260 int tem; 9260 int tem;
9261 struct it it; 9261 struct it it;
9262 /* Record it now because it's overwritten. */ 9262 /* Record it now because it's overwritten. */
9263 int current_matrix_up_to_date_p = 0; 9263 int current_matrix_up_to_date_p = 0;
9264 int temp_scroll_step = 0; 9264 int temp_scroll_step = 0;
9265 int count = specpdl_ptr - specpdl; 9265 int count = BINDING_STACK_SIZE ();
9266 int rc; 9266 int rc;
9267 9267
9268 SET_TEXT_POS (lpoint, PT, PT_BYTE); 9268 SET_TEXT_POS (lpoint, PT, PT_BYTE);
9269 opoint = lpoint; 9269 opoint = lpoint;
9270 9270