diff options
| author | Eli Zaretskii | 2015-10-23 23:06:57 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2015-10-23 23:06:57 +0300 |
| commit | 7836e422e46721290c076969b87e277aa264ceca (patch) | |
| tree | ab81436ded8cdc20da55b15f1a5a020c899ef893 /src | |
| parent | 8b47daab5ce7da394a057f40aa2738b6c204c2f5 (diff) | |
| download | emacs-7836e422e46721290c076969b87e277aa264ceca.tar.gz emacs-7836e422e46721290c076969b87e277aa264ceca.zip | |
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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 6 |
1 files changed, 5 insertions, 1 deletions
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) | |||
| 13925 | above caused some change (e.g., a change in faces) that requires | 13925 | above caused some change (e.g., a change in faces) that requires |
| 13926 | considering the entire frame again. */ | 13926 | considering the entire frame again. */ |
| 13927 | if (sf->fonts_changed || sf->redisplay) | 13927 | if (sf->fonts_changed || sf->redisplay) |
| 13928 | goto retry; | 13928 | { |
| 13929 | if (sf->redisplay) | ||
| 13930 | windows_or_buffers_changed = 50; | ||
| 13931 | goto retry; | ||
| 13932 | } | ||
| 13929 | 13933 | ||
| 13930 | /* Prevent freeing of realized faces, since desired matrices are | 13934 | /* Prevent freeing of realized faces, since desired matrices are |
| 13931 | pending that reference the faces we computed and cached. */ | 13935 | pending that reference the faces we computed and cached. */ |