]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix infloop in redisplay caused by a recent change
authorEli Zaretskii <eliz@gnu.org>
Mon, 7 Oct 2019 16:03:04 +0000 (19:03 +0300)
committerEli Zaretskii <eliz@gnu.org>
Mon, 7 Oct 2019 16:03:04 +0000 (19:03 +0300)
* 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>.

src/xdisp.c

index 1f3a8136f8b237ae1ce23b6152dbcb229bca9362..192bf010136eed9bc997413bdbe95c17e65ab0ab 100644 (file)
@@ -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;