emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: YAMAMOTO Mitsuharu
Subject: [Emacs-diffs] Changes to emacs/src/dispnew.c
Date: Fri, 07 Oct 2005 03:38:56 -0400

Index: emacs/src/dispnew.c
diff -c emacs/src/dispnew.c:1.356 emacs/src/dispnew.c:1.357
*** emacs/src/dispnew.c:1.356   Thu Sep  1 14:16:19 2005
--- emacs/src/dispnew.c Fri Oct  7 07:38:47 2005
***************
*** 4035,4057 ****
  
        if (row->overlapping_p && i > 0 && bottom_y < yb)
        {
!         if (row->used[LEFT_MARGIN_AREA])
!           rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA);
  
!         if (row->used[TEXT_AREA])
!           rif->fix_overlapping_area (w, row, TEXT_AREA);
  
!         if (row->used[RIGHT_MARGIN_AREA])
!           rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA);
  
!         /* Record in neighbour rows that ROW overwrites part of their
!            display.  */
!         if (row->phys_ascent > row->ascent && i > 0)
!           MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1;
!         if ((row->phys_height - row->phys_ascent
!              > row->height - row->ascent)
!             && bottom_y < yb)
!           MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p = 1;
        }
  
        if (bottom_y >= yb)
--- 4035,4067 ----
  
        if (row->overlapping_p && i > 0 && bottom_y < yb)
        {
!         int overlaps = 0;
  
!         if (MATRIX_ROW_OVERLAPS_PRED_P (row)
!             && !MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p)
!           overlaps |= OVERLAPS_PRED;
!         if (MATRIX_ROW_OVERLAPS_SUCC_P (row)
!             && !MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p)
!           overlaps |= OVERLAPS_SUCC;
  
!         if (overlaps)
!           {
!             if (row->used[LEFT_MARGIN_AREA])
!               rif->fix_overlapping_area (w, row, LEFT_MARGIN_AREA, overlaps);
  
!             if (row->used[TEXT_AREA])
!               rif->fix_overlapping_area (w, row, TEXT_AREA, overlaps);
! 
!             if (row->used[RIGHT_MARGIN_AREA])
!               rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA, overlaps);
! 
!             /* Record in neighbour rows that ROW overwrites part of
!                their display.  */
!             if (overlaps & OVERLAPS_PRED)
!               MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1;
!             if (overlaps & OVERLAPS_SUCC)
!               MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p = 1;
!           }
        }
  
        if (bottom_y >= yb)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]