[Emacs-diffs] Changes to emacs/src/xdisp.c

[Juanma Barranquero]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.761 emacs/src/xdisp.c:1.762
*** emacs/src/xdisp.c:1.761     Sun Jul  7 06:50:49 2002
--- emacs/src/xdisp.c   Wed Jul 10 04:43:24 2002
***************
*** 1328,1334 ****
      val = Qnil;
    else
      {
!       int count = BINDING_STACK_SIZE ();
        struct gcpro gcpro1;
  
        GCPRO1 (sexpr);
--- 1328,1334 ----
      val = Qnil;
    else
      {
!       int count = SPECPDL_INDEX ();
        struct gcpro gcpro1;
  
        GCPRO1 (sexpr);
***************
*** 1360,1366 ****
      val = Qnil;
    else
      {
!       int count = BINDING_STACK_SIZE ();
        struct gcpro gcpro1;
  
        GCPRO1 (args[0]);
--- 1360,1366 ----
      val = Qnil;
    else
      {
!       int count = SPECPDL_INDEX ();
        struct gcpro gcpro1;
  
        GCPRO1 (args[0]);
***************
*** 2241,2247 ****
          prop = Fget_char_property (pos, Qfontified, Qnil),
          NILP (prop)))
      {
!       int count = BINDING_STACK_SIZE ();
        Lisp_Object val;
  
        val = Vfontification_functions;
--- 2241,2247 ----
          prop = Fget_char_property (pos, Qfontified, Qnil),
          NILP (prop)))
      {
!       int count = SPECPDL_INDEX ();
        Lisp_Object val;
  
        val = Vfontification_functions;
***************
*** 2864,2870 ****
  
    if (!NILP (form) && !EQ (form, Qt))
      {
!       int count = BINDING_STACK_SIZE ();
        struct gcpro gcpro1;
  
        /* Bind `object' to the object having the `display' property, a
--- 2864,2870 ----
  
    if (!NILP (form) && !EQ (form, Qt))
      {
!       int count = SPECPDL_INDEX ();
        struct gcpro gcpro1;
  
        /* Bind `object' to the object having the `display' property, a
***************
*** 2935,2941 ****
              /* Evaluate IT->font_height with `height' bound to the
                 current specified height to get the new height.  */
              Lisp_Object value;
!             int count = BINDING_STACK_SIZE ();
  
              specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]);
              value = safe_eval (it->font_height);
--- 2935,2941 ----
              /* Evaluate IT->font_height with `height' bound to the
                 current specified height to get the new height.  */
              Lisp_Object value;
!             int count = SPECPDL_INDEX ();
  
              specbind (Qheight, face->lface[LFACE_HEIGHT_INDEX]);
              value = safe_eval (it->font_height);
***************
*** 6271,6277 ****
  {
    Lisp_Object buffer;
    int this_one, the_other, clear_buffer_p, rc;
!   int count = BINDING_STACK_SIZE ();
  
    /* If buffers aren't live, make new ones.  */
    ensure_echo_area_buffers ();
--- 6271,6277 ----
  {
    Lisp_Object buffer;
    int this_one, the_other, clear_buffer_p, rc;
!   int count = SPECPDL_INDEX ();
  
    /* If buffers aren't live, make new ones.  */
    ensure_echo_area_buffers ();
***************
*** 6446,6452 ****
  
        if (Z > BEG)
        {
!         int count = BINDING_STACK_SIZE ();
          specbind (Qinhibit_read_only, Qt);
          del_range (BEG, Z);
          unbind_to (count, Qnil);
--- 6446,6452 ----
  
        if (Z > BEG)
        {
!         int count = SPECPDL_INDEX ();
          specbind (Qinhibit_read_only, Qt);
          del_range (BEG, Z);
          unbind_to (count, Qnil);
***************
*** 7126,7132 ****
              /* Must update other windows.  Likewise as in other
                 cases, don't let this update be interrupted by
                 pending input.  */
!             int count = BINDING_STACK_SIZE ();
              specbind (Qredisplay_dont_pause, Qt);
              windows_or_buffers_changed = 1;
              redisplay_internal (0);
--- 7126,7132 ----
              /* Must update other windows.  Likewise as in other
                 cases, don't let this update be interrupted by
                 pending input.  */
!             int count = SPECPDL_INDEX ();
              specbind (Qredisplay_dont_pause, Qt);
              windows_or_buffers_changed = 1;
              redisplay_internal (0);
***************
*** 7359,7365 ****
    if (all_windows)
      {
        Lisp_Object tail, frame;
!       int count = BINDING_STACK_SIZE ();
  
        record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
  
--- 7359,7365 ----
    if (all_windows)
      {
        Lisp_Object tail, frame;
!       int count = SPECPDL_INDEX ();
  
        record_unwind_protect (Fset_match_data, Fmatch_data (Qnil, Qnil));
  
***************
*** 7477,7483 ****
              != !NILP (w->region_showing)))
        {
          struct buffer *prev = current_buffer;
!         int count = BINDING_STACK_SIZE ();
  
          specbind (Qinhibit_menubar_update, Qt);
  
--- 7477,7483 ----
              != !NILP (w->region_showing)))
        {
          struct buffer *prev = current_buffer;
!         int count = SPECPDL_INDEX ();
  
          specbind (Qinhibit_menubar_update, Qt);
  
***************
*** 7571,7577 ****
              != !NILP (w->region_showing)))
        {
          struct buffer *prev = current_buffer;
!         int count = BINDING_STACK_SIZE ();
  
          /* Set current_buffer to the buffer of the selected
             window of the frame, so that we get the right local
--- 7571,7577 ----
              != !NILP (w->region_showing)))
        {
          struct buffer *prev = current_buffer;
!         int count = SPECPDL_INDEX ();
  
          /* Set current_buffer to the buffer of the selected
             window of the frame, so that we get the right local
***************
*** 8504,8510 ****
  
    /* Record a function that resets redisplaying_p to its old value
       when we leave this function.  */
!   count = BINDING_STACK_SIZE ();
    record_unwind_protect (unwind_redisplay, make_number (redisplaying_p));
    ++redisplaying_p;
  
--- 8504,8510 ----
  
    /* Record a function that resets redisplaying_p to its old value
       when we leave this function.  */
!   count = SPECPDL_INDEX ();
    record_unwind_protect (unwind_redisplay, make_number (redisplaying_p));
    ++redisplaying_p;
  
***************
*** 10090,10096 ****
    /* Record it now because it's overwritten.  */
    int current_matrix_up_to_date_p = 0;
    int temp_scroll_step = 0;
!   int count = BINDING_STACK_SIZE ();
    int rc;
    int centering_position;
  
--- 10090,10096 ----
    /* Record it now because it's overwritten.  */
    int current_matrix_up_to_date_p = 0;
    int temp_scroll_step = 0;
!   int count = SPECPDL_INDEX ();
    int rc;
    int centering_position;