From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 23 Oct 2015 20:06:57 +0000 (+0300)
Subject: Fix infloop in redisplay introduced by a recent change
X-Git-Tag: emacs-25.0.90~1047
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7836e422e46721290c076969b87e277aa264ceca;p=emacs.git

Fix infloop in redisplay introduced by a recent change

* src/xdisp.c (redisplay_internal): Avoid inflooping when
redisplaying the selected window sets the selected frame's
redisplay flag.  (Bug#21745)
---

diff --git a/src/xdisp.c b/src/xdisp.c
index bfd3a8299ad..02388da994b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13925,7 +13925,11 @@ redisplay_internal (void)
 	 above caused some change (e.g., a change in faces) that requires
 	 considering the entire frame again.  */
       if (sf->fonts_changed || sf->redisplay)
-	goto retry;
+	{
+	  if (sf->redisplay)
+	    windows_or_buffers_changed = 50;
+	  goto retry;
+	}
 
       /* Prevent freeing of realized faces, since desired matrices are
 	 pending that reference the faces we computed and cached.  */