]> code.delx.au - gnu-emacs/commitdiff
Fix infloop in redisplay introduced by a recent change
authorEli Zaretskii <eliz@gnu.org>
Fri, 23 Oct 2015 20:06:57 +0000 (23:06 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 23 Oct 2015 20:06:57 +0000 (23:06 +0300)
* src/xdisp.c (redisplay_internal): Avoid inflooping when
redisplaying the selected window sets the selected frame's
redisplay flag.  (Bug#21745)

src/xdisp.c

index bfd3a8299ad916097b2333b6c8338510a43eb7a1..02388da994bbe299a43127f7cf83b815ca6c4c23 100644 (file)
@@ -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.  */