From de7de9cc0cfcef1c7651887fd36fc2a346dadd6c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 21 Dec 2017 19:43:07 +0200 Subject: [PATCH] Prevent infloop in redisplay on TTY frames * src/xdisp.c (extend_face_to_end_of_line): Avoid infloop when filling up display margins with the default face's background. (Bug#29789) --- src/xdisp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/xdisp.c b/src/xdisp.c index 7601e26a902..c3a46651da8 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -20280,6 +20280,7 @@ extend_face_to_end_of_line (struct it *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]; } it->current_x = saved_x; @@ -20317,6 +20318,7 @@ extend_face_to_end_of_line (struct it *it) { PRODUCE_GLYPHS (it); it->current_x += it->pixel_width; + ++it->glyph_row->used[RIGHT_MARGIN_AREA]; } it->area = TEXT_AREA; -- 2.39.2