diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2017-12-21 20:28:55 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2017-12-21 20:28:55 +0200 |
| commit | ad2a47ce83c5c6fada96706a0e596ecc79d77696 (patch) | |
| tree | ca11ec5cda9d71e0852715df7a940f0b83f2353d | |
| parent | 88ddf53ef086ee2f2e0ea729bc4afbf34d88d82b (diff) | |
| download | emacs-ad2a47ce83c5c6fada96706a0e596ecc79d77696.tar.gz | |
; * src/xdisp.c (extend_face_to_end_of_line): Fix last change.
| -rw-r--r-- | src/xdisp.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index c3a46651da8..538c3e6b87e 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -20274,13 +20274,14 @@ extend_face_to_end_of_line (struct it *it) it->area = LEFT_MARGIN_AREA; it->face_id = default_face->id; 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); /* term.c:produce_glyphs advances it->current_x only for TEXT_AREA. */ it->current_x += it->pixel_width; - ++it->glyph_row->used[LEFT_MARGIN_AREA]; + g++; } it->current_x = saved_x; @@ -20314,11 +20315,12 @@ extend_face_to_end_of_line (struct it *it) it->area = RIGHT_MARGIN_AREA; it->face_id = default_face->id; 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); it->current_x += it->pixel_width; - ++it->glyph_row->used[RIGHT_MARGIN_AREA]; + g++; } it->area = TEXT_AREA; |