mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-30 00:51:50 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Gerd Moellmann 2001-02-15 12:30:16 +00:00
parent 9a2a6f7352
commit 8399f8a0cd
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -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.

8
src/dispnew.c
View file

@ -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))
{