From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 21 Dec 2017 17:43:07 +0000 (+0200)
Subject: Prevent infloop in redisplay on TTY frames
X-Git-Tag: emacs-26.0.91~97
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de7de9c;p=emacs.git

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

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;