[Emacs-diffs] master 00787a2: Fix infloop in redisplay caused by a recent change

[Eli Zaretskii]

branch: master
commit 00787a2abd3b15699c12bbe8a2be08db2c0aa313
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    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 <address@hidden>.
---
 src/xdisp.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 1f3a813..192bf01 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -15683,7 +15683,11 @@ redisplay_internal (void)
                     garbaged flag, in which case we need to
                     redisplay the frame.  */
                   if (FRAME_GARBAGED_P (f))
-                   goto retry_frame;
+                   {
+                     fset_redisplay (f);
+                     f->garbaged = false;
+                     goto retry_frame;
+                   }
                  f->cursor_type_changed = false;
                  f->updated_p = true;
                  f->inhibit_clear_image_cache = false;