[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 7836e42: Fix infloop in redisplay introduced by a r
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 7836e42: Fix infloop in redisplay introduced by a recent change |
Date: |
Fri, 23 Oct 2015 20:07:52 +0000 |
branch: master
commit 7836e422e46721290c076969b87e277aa264ceca
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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)
---
src/xdisp.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/xdisp.c b/src/xdisp.c
index bfd3a82..02388da 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. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 7836e42: Fix infloop in redisplay introduced by a recent change,
Eli Zaretskii <=