[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 ad2a47c: ; * src/xdisp.c (extend_face_to_end_of_l
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 ad2a47c: ; * src/xdisp.c (extend_face_to_end_of_line): Fix last change. |
Date: |
Thu, 21 Dec 2017 13:29:16 -0500 (EST) |
branch: emacs-26
commit ad2a47ce83c5c6fada96706a0e596ecc79d77696
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
; * src/xdisp.c (extend_face_to_end_of_line): Fix last change.
---
src/xdisp.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index c3a4665..538c3e6 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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 ad2a47c: ; * src/xdisp.c (extend_face_to_end_of_line): Fix last change.,
Eli Zaretskii <=