(redraw_overlapping_rows): Fix detection of

overlapping for topmost and bottommost rows.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3ae638fbb4167674ee3eddaf7a280b6af4f58e93..aca9e8014cf4f60dccc74f810a160a4e9766dea3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2009-04-08  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
+       * dispnew.c (redraw_overlapping_rows): Fix detection of
+       overlapping for topmost and bottommost rows.
+
        * ftfont.c (ftfont_text_extents): Fix calculation of
        metrics->descent.
 

diff --git a/src/dispnew.c b/src/dispnew.c
index bbe0f9fc96137b6a81c4d80d145cafce2f70c573..3fbb113dd9fa7ec6229a88f26172c77df7a9343a 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4129,14 +4129,14 @@ redraw_overlapping_rows (w, yb)
 
       bottom_y = MATRIX_ROW_BOTTOM_Y (row);
 
-      if (row->overlapping_p && i > 0 && bottom_y < yb)
+      if (row->overlapping_p)
        {
          int overlaps = 0;
 
-         if (MATRIX_ROW_OVERLAPS_PRED_P (row)
+         if (MATRIX_ROW_OVERLAPS_PRED_P (row) && i > 0
              && !MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p)
            overlaps |= OVERLAPS_PRED;
-         if (MATRIX_ROW_OVERLAPS_SUCC_P (row)
+         if (MATRIX_ROW_OVERLAPS_SUCC_P (row) && bottom_y < yb
              && !MATRIX_ROW (w->current_matrix, i + 1)->overlapped_p)
            overlaps |= OVERLAPS_SUCC;