diff options
| author | Eli Zaretskii | 2019-10-07 19:03:04 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2019-10-07 19:03:04 +0300 |
| commit | 00787a2abd3b15699c12bbe8a2be08db2c0aa313 (patch) | |
| tree | 95b950f8cec6ae0a7c3fc889badcf9b765cb0a8d /src | |
| parent | 0811177c96c3265b88592cfb4d83eab53b9b98ba (diff) | |
| download | emacs-00787a2abd3b15699c12bbe8a2be08db2c0aa313.tar.gz emacs-00787a2abd3b15699c12bbe8a2be08db2c0aa313.zip | |
Fix infloop in redisplay caused by a recent change
* src/xdisp.c (redisplay_internal): Avoid inflooping due to a
frame's garbaged flag being set after update_frame. Reported
by Michael Heerdegen <michael_heerdegen@web.de>.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 1f3a8136f8b..192bf010136 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -15683,7 +15683,11 @@ redisplay_internal (void) | |||
| 15683 | garbaged flag, in which case we need to | 15683 | garbaged flag, in which case we need to |
| 15684 | redisplay the frame. */ | 15684 | redisplay the frame. */ |
| 15685 | if (FRAME_GARBAGED_P (f)) | 15685 | if (FRAME_GARBAGED_P (f)) |
| 15686 | goto retry_frame; | 15686 | { |
| 15687 | fset_redisplay (f); | ||
| 15688 | f->garbaged = false; | ||
| 15689 | goto retry_frame; | ||
| 15690 | } | ||
| 15687 | f->cursor_type_changed = false; | 15691 | f->cursor_type_changed = false; |
| 15688 | f->updated_p = true; | 15692 | f->updated_p = true; |
| 15689 | f->inhibit_clear_image_cache = false; | 15693 | f->inhibit_clear_image_cache = false; |