diff options
| author | Eli Zaretskii | 2017-12-21 19:43:07 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2017-12-21 19:43:07 +0200 |
| commit | de7de9cc0cfcef1c7651887fd36fc2a346dadd6c (patch) | |
| tree | b94b88005016eca46a9649781ccb1576352266bb | |
| parent | 293720e930ac33e007d3402b677d6c482d0a3dbf (diff) | |
| download | emacs-de7de9cc0cfcef1c7651887fd36fc2a346dadd6c.tar.gz emacs-de7de9cc0cfcef1c7651887fd36fc2a346dadd6c.zip | |
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)
| -rw-r--r-- | src/xdisp.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) | |||
| 20280 | /* term.c:produce_glyphs advances it->current_x only for | 20280 | /* term.c:produce_glyphs advances it->current_x only for |
| 20281 | TEXT_AREA. */ | 20281 | TEXT_AREA. */ |
| 20282 | it->current_x += it->pixel_width; | 20282 | it->current_x += it->pixel_width; |
| 20283 | ++it->glyph_row->used[LEFT_MARGIN_AREA]; | ||
| 20283 | } | 20284 | } |
| 20284 | 20285 | ||
| 20285 | it->current_x = saved_x; | 20286 | it->current_x = saved_x; |
| @@ -20317,6 +20318,7 @@ extend_face_to_end_of_line (struct it *it) | |||
| 20317 | { | 20318 | { |
| 20318 | PRODUCE_GLYPHS (it); | 20319 | PRODUCE_GLYPHS (it); |
| 20319 | it->current_x += it->pixel_width; | 20320 | it->current_x += it->pixel_width; |
| 20321 | ++it->glyph_row->used[RIGHT_MARGIN_AREA]; | ||
| 20320 | } | 20322 | } |
| 20321 | 20323 | ||
| 20322 | it->area = TEXT_AREA; | 20324 | it->area = TEXT_AREA; |