diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2001-02-15 12:30:16 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2001-02-15 12:30:16 +0000 |
| commit | 8399f8a0cd00d4c2f99e20585bb6d2d70d7177af (patch) | |
| tree | caac818a183031424f539933e9015b077c71edc4 | |
| parent | 9a2a6f73529601126566ae0d5c77b309bb810cb9 (diff) | |
| download | emacs-8399f8a0cd00d4c2f99e20585bb6d2d70d7177af.tar.gz | |
(update_text_area): Undo change of 2001-01-12.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/dispnew.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index daaab3b63c5..295773aabaa 100644 --- 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 be75ffe24b4..04532d486dd 100644 --- 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)) { |