From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 7 Oct 2019 16:03:04 +0000 (+0300)
Subject: Fix infloop in redisplay caused by a recent change
X-Git-Tag: emacs-27.0.90~1233
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=00787a2abd3b15699c12bbe8a2be08db2c0aa313;p=emacs.git

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

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