(update_text_area): Undo change of 2001-01-12.

diff --git a/src/ChangeLog b/src/ChangeLog
index daaab3b63c502aa270b8f0cd84382d8d12b4ea6f..295773aabaa2fa8d00f1d178e25234f5ecbaaaf0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-15  Gerd Moellmann  <gerd@gnu.org>
+
+       * dispnew.c (update_text_area): Undo change of 2001-01-12.
+
 2001-02-14  Dave Love  <fx@gnu.org>
 
        * coding.c: Doc and message fixes.

diff --git a/src/dispnew.c b/src/dispnew.c
index be75ffe24b4efa8b5c3fc2191c265b75e30dd0ff..04532d486dda2d0c67ad6d451a76cd8165322069 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4244,18 +4244,18 @@ update_text_area (w, vpos)
       int overlapping_glyphs_p = current_row->contains_overlapping_glyphs_p;
       int desired_stop_pos = desired_row->used[TEXT_AREA];
 
-#if 0 /* This shouldn't be necessary.  Let's check it.  */
       /* If the desired row extends its face to the text area end,
         make sure we write at least one glyph, so that the face
         extension actually takes place.  */
       if (MATRIX_ROW_EXTENDS_FACE_P (desired_row))
        --desired_stop_pos;
-#endif
       
       stop = min (current_row->used[TEXT_AREA], desired_stop_pos);
       i = 0;
       x = desired_row->x;
-      
+
+      /* Loop over glyphs that current and desired row may have
+        in common.  */
       while (i < stop)
        {
          int can_skip_p = 1;
@@ -4362,13 +4362,11 @@ update_text_area (w, vpos)
       /* Maybe clear to end of line.  */
       if (MATRIX_ROW_EXTENDS_FACE_P (desired_row))
        {
-#if 0 
          /* If new row extends to the end of the text area, nothing
             has to be cleared, if and only if we did a write_glyphs
             above.  This is made sure by setting desired_stop_pos
             appropriately above.  */
          xassert (i < desired_row->used[TEXT_AREA]);
-#endif
        }
       else if (MATRIX_ROW_EXTENDS_FACE_P (current_row))
        {