]> git.eshelyaron.com Git - emacs.git/commitdiff
Prevent infloop in redisplay on TTY frames
authorEli Zaretskii <eliz@gnu.org>
Thu, 21 Dec 2017 17:43:07 +0000 (19:43 +0200)
committerEli Zaretskii <eliz@gnu.org>
Thu, 21 Dec 2017 17:43:07 +0000 (19:43 +0200)
* 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

index 7601e26a9023d693f9c27b98ca302aa37c91cee8..c3a46651da8d2bf478e820adf976a2d8fad3a5e9 100644 (file)
@@ -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;