procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; * src/xdisp.c (extend_face_to_end_of_line): Fix last change.

Browse source
This commit is contained in:
Eli Zaretskii 2017-12-21 20:28:55 +02:00
parent 88ddf53ef0
commit ad2a47ce83
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/xdisp.c
View file

@ -20274,13 +20274,14 @@ extend_face_to_end_of_line (struct it *it)
it->area = LEFT_MARGIN_AREA; it->area = LEFT_MARGIN_AREA;
it->face_id = default_face->id; it->face_id = default_face->id;
while (it->glyph_row->used[LEFT_MARGIN_AREA] while (it->glyph_row->used[LEFT_MARGIN_AREA]
< WINDOW_LEFT_MARGIN_WIDTH (it->w)) < WINDOW_LEFT_MARGIN_WIDTH (it->w)
&& g < it->glyph_row->glyphs[TEXT_AREA])
{ {
PRODUCE_GLYPHS (it); PRODUCE_GLYPHS (it);
/* term.c:produce_glyphs advances it->current_x only for /* term.c:produce_glyphs advances it->current_x only for
TEXT_AREA. */ TEXT_AREA. */
it->current_x += it->pixel_width; it->current_x += it->pixel_width;
++it->glyph_row->used[LEFT_MARGIN_AREA]; g++;
} }
it->current_x = saved_x; it->current_x = saved_x;
@ -20314,11 +20315,12 @@ extend_face_to_end_of_line (struct it *it)
it->area = RIGHT_MARGIN_AREA; it->area = RIGHT_MARGIN_AREA;
it->face_id = default_face->id; it->face_id = default_face->id;
while (it->glyph_row->used[RIGHT_MARGIN_AREA] while (it->glyph_row->used[RIGHT_MARGIN_AREA]
< WINDOW_RIGHT_MARGIN_WIDTH (it->w)) < WINDOW_RIGHT_MARGIN_WIDTH (it->w)
&& g < it->glyph_row->glyphs[LAST_AREA])
{ {
PRODUCE_GLYPHS (it); PRODUCE_GLYPHS (it);
it->current_x += it->pixel_width; it->current_x += it->pixel_width;
++it->glyph_row->used[RIGHT_MARGIN_AREA]; g++;
} }
it->area = TEXT_AREA; it->area = TEXT_AREA;