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

[Stefan Monnier]

Index: emacs/src/indent.c
diff -c emacs/src/indent.c:1.146 emacs/src/indent.c:1.147
*** emacs/src/indent.c:1.146    Sat Dec  8 19:57:28 2001
--- emacs/src/indent.c  Tue Mar  5 13:56:16 2002
***************
*** 221,227 ****
  {
    Lisp_Object prop, position, overlay_limit, proplimit;
    Lisp_Object buffer;
!   int end;
  
    XSETFASTINT (position, pos);
    XSETBUFFER (buffer, current_buffer);
--- 221,227 ----
  {
    Lisp_Object prop, position, overlay_limit, proplimit;
    Lisp_Object buffer;
!   int end, inv_p;
  
    XSETFASTINT (position, pos);
    XSETBUFFER (buffer, current_buffer);
***************
*** 266,276 ****
      }
    /* if the `invisible' property is set, we can skip to
       the next property change */
!   if (!NILP (window) && EQ (XWINDOW (window)->buffer, buffer))
!     prop = Fget_char_property (position, Qinvisible, window);
!   else
!     prop = Fget_char_property (position, Qinvisible, buffer);
!   if (TEXT_PROP_MEANS_INVISIBLE (prop) > NILP (window))
      return *next_boundary_p;
    return pos;
  }
--- 266,278 ----
      }
    /* if the `invisible' property is set, we can skip to
       the next property change */
!   prop = Fget_char_property (position, Qinvisible,
!                            (!NILP (window)
!                             && EQ (XWINDOW (window)->buffer, buffer))
!                            ? window : buffer);
!   inv_p = TEXT_PROP_MEANS_INVISIBLE (prop);
!   /* When counting columns (window == nil), don't skip over ellipsis text.  */
!   if (NILP (window) ? inv_p == 1 : inv_p)
      return *next_boundary_p;
    return pos;
  }