procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bugs caused by running window change functions during redisplay

Browse source 
* src/xdisp.c (redisplay_internal): Run window change
functions before updating the display so changes induced by
these functions can get caught by redisplay (Bug#34138).
* src/window.c (run_window_change_functions): Bind
Qinhibit_redisplay to avoid that the minibuffer window gets
resized while running window change functions (Bug#34179,
Bug#34260).
This commit is contained in:
Martin Rudalics 2019-02-02 09:43:34 +01:00
parent c0052dd43d
commit dc1d2d3c22
2 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/window.c
View file

@ -3710,6 +3710,7 @@ run_window_change_functions (void)
ptrdiff_t count_outer = SPECPDL_INDEX ();
record_unwind_protect_void (window_change_record);
specbind (Qinhibit_redisplay, Qt);
FOR_EACH_FRAME (tail, frame)
{

27
src/xdisp.c
View file

@ -14153,6 +14153,9 @@ redisplay_internal (void)
clear_garbaged_frames ();
}
if (!NILP (Vrun_hooks))
run_window_change_functions ();
if (windows_or_buffers_changed && !update_mode_lines)
/* Code that sets windows_or_buffers_changed doesn't distinguish whether
only the windows's contents needs to be refreshed, or whether the
@ -14332,18 +14335,6 @@ redisplay_internal (void)
&& (w = XWINDOW (selected_window)) != sw)
goto retry;
if (!NILP (Vrun_hooks))
{
run_window_change_functions ();
/* If windows or buffers changed or selected_window
changed, redisplay again. */
if ((windows_or_buffers_changed)
|| (WINDOWP (selected_window)
&& (w = XWINDOW (selected_window)) != sw))
goto retry;
}
/* We used to always goto end_of_redisplay here, but this
isn't enough if we have a blinking cursor. */
if (w->cursor_off_p == w->last_cursor_off_p)
@ -14707,18 +14698,6 @@ redisplay_internal (void)
&& (w = XWINDOW (selected_window)) != sw))
goto retry;
if (!NILP (Vrun_hooks))
{
run_window_change_functions ();
/* If windows or buffers changed or selected_window changed,
redisplay again. */
if ((windows_or_buffers_changed)
|| (WINDOWP (selected_window)
&& (w = XWINDOW (selected_window)) != sw))
goto retry;
}
/* Clear the face and image caches.
We used to do this only if consider_all_windows_p. But the cache