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

[Stefan Monnier]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.842 emacs/src/xdisp.c:1.843
*** emacs/src/xdisp.c:1.842     Tue Jul  8 17:28:38 2003
--- emacs/src/xdisp.c   Wed Jul  9 10:51:29 2003
***************
*** 3986,3992 ****
       int charpos;
  {
    extern Lisp_Object Qafter_string, Qbefore_string, Qwindow, Qpriority;
!   Lisp_Object ov, overlay, window, str, invisible;
    int start, end;
    int size = 20;
    int n = 0, i, j, invis_p;
--- 3986,3993 ----
       int charpos;
  {
    extern Lisp_Object Qafter_string, Qbefore_string, Qwindow, Qpriority;
!   Lisp_Object overlay, window, str, invisible;
!   struct Lisp_Overlay *ov;
    int start, end;
    int size = 20;
    int n = 0, i, j, invis_p;
***************
*** 4026,4034 ****
    while (0)
  
    /* Process overlay before the overlay center.  */
!   for (ov = current_buffer->overlays_before; CONSP (ov); ov = XCDR (ov))
      {
!       overlay = XCAR (ov);
        xassert (OVERLAYP (overlay));
        start = OVERLAY_POSITION (OVERLAY_START (overlay));
        end = OVERLAY_POSITION (OVERLAY_END (overlay));
--- 4027,4035 ----
    while (0)
  
    /* Process overlay before the overlay center.  */
!   for (ov = current_buffer->overlays_before; ov; ov = ov->next)
      {
!       XSETMISC (overlay, ov);
        xassert (OVERLAYP (overlay));
        start = OVERLAY_POSITION (OVERLAY_START (overlay));
        end = OVERLAY_POSITION (OVERLAY_END (overlay));
***************
*** 4066,4074 ****
      }
  
    /* Process overlays after the overlay center.  */
!   for (ov = current_buffer->overlays_after; CONSP (ov); ov = XCDR (ov))
      {
!       overlay = XCAR (ov);
        xassert (OVERLAYP (overlay));
        start = OVERLAY_POSITION (OVERLAY_START (overlay));
        end = OVERLAY_POSITION (OVERLAY_END (overlay));
--- 4067,4075 ----
      }
  
    /* Process overlays after the overlay center.  */
!   for (ov = current_buffer->overlays_after; ov; ov = ov->next)
      {
!       XSETMISC (overlay, ov);
        xassert (OVERLAYP (overlay));
        start = OVERLAY_POSITION (OVERLAY_START (overlay));
        end = OVERLAY_POSITION (OVERLAY_END (overlay));