mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-22 04:21:24 -08:00
Code Issues Projects Releases Wiki Activity

(redisplay_internal): Check that the frame is still

Browse source 
live after redisplay of its windows.
(redisplay_windows): Check that the window is still live.
This commit is contained in:
Andreas Schwab 2009-06-18 09:49:05 +00:00
parent 647123d8f2
commit 90f20d9422
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2009-06-18 Andreas Schwab <aschwab@redhat.com>
* xdisp.c (redisplay_internal): Check that the frame is still
live after redisplay of its windows.
(redisplay_windows): Check that the window is still live.
2009-06-17 Andreas Schwab <schwab@linux-m68k.org>
* coding.c (detect_coding_utf_16): Fix previous change.

6
src/xdisp.c
View file

@ -11838,6 +11838,10 @@ redisplay_internal (preserve_echo_area)
if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
redisplay_windows (FRAME_ROOT_WINDOW (f));
/* The X error handler may have deleted that frame. */
if (!FRAME_LIVE_P (f))
continue;
/* Any scroll bars which redisplay_windows should have
nuked should now go away. */
if (FRAME_TERMINAL (f)->judge_scroll_bars_hook)
@ -12255,7 +12259,7 @@ redisplay_windows (window)
redisplay_windows (w->hchild);
else if (!NILP (w->vchild))
redisplay_windows (w->vchild);
else
else if (!NILP (w->buffer))
{
displayed_buffer = XBUFFER (w->buffer);
/* Use list_of_error, not Qerror, so that