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

[Stefan Monnier]

Index: emacs/src/syntax.c
diff -c emacs/src/syntax.c:1.184 emacs/src/syntax.c:1.185
*** emacs/src/syntax.c:1.184    Sun Aug  7 12:33:18 2005
--- emacs/src/syntax.c  Mon Aug 29 20:49:28 2005
***************
*** 133,139 ****
  {
    Lisp_Object tmp_table;
    int cnt = 0, invalidate = 1;
!   INTERVAL i, oldi;
  
    if (init)
      {
--- 133,139 ----
  {
    Lisp_Object tmp_table;
    int cnt = 0, invalidate = 1;
!   INTERVAL i;
  
    if (init)
      {
***************
*** 164,170 ****
        gl_state.e_property = INTERVAL_LAST_POS (i) - gl_state.offset;
        goto update;
      }
!   oldi = i = count > 0 ? gl_state.forward_i : gl_state.backward_i;
  
    /* We are guaranteed to be called with CHARPOS either in i,
       or further off.  */
--- 164,170 ----
        gl_state.e_property = INTERVAL_LAST_POS (i) - gl_state.offset;
        goto update;
      }
!   i = count > 0 ? gl_state.forward_i : gl_state.backward_i;
  
    /* We are guaranteed to be called with CHARPOS either in i,
       or further off.  */
***************
*** 249,255 ****
            }
          else
            {
!             gl_state.b_property = i->position + LENGTH (i) - gl_state.offset;
              gl_state.backward_i = i;
            }
          return;
--- 249,256 ----
            }
          else
            {
!             gl_state.b_property
!               = i->position + LENGTH (i) - gl_state.offset;
              gl_state.backward_i = i;
            }
          return;
***************
*** 258,264 ****
        {
          if (count > 0)
            {
!             gl_state.e_property = i->position + LENGTH (i) - gl_state.offset;
              gl_state.forward_i = i;
            }
          else
--- 259,270 ----
        {
          if (count > 0)
            {
!             gl_state.e_property
!               = i->position + LENGTH (i) - gl_state.offset
!               /* e_property at EOB is not set to ZV but to ZV+1, so that
!                  we can do INC(from);UPDATE_SYNTAX_TABLE_FORWARD without
!                  having to check eob between the two.  */
!               + (NULL_INTERVAL_P (next_interval (i)) ? 1 : 0);
              gl_state.forward_i = i;
            }
          else