2 files changed, 6 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 3ae638fbb41..aca9e8014cf 100644
--- 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 bbe0f9fc961..3fbb113dd9f 100644
--- 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;