; * src/xdisp.c (redisplay_internal): Reinstate the FRAME_LIVE_P test.

diff --git a/src/xdisp.c b/src/xdisp.c
index 4e5250486f5a44e5dce2b4806563ffb823724539..ea2d11e8b4e3026e55b5b2ceabfae027f8abdee4 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16867,6 +16867,10 @@ redisplay_internal (void)
              else if (!REDISPLAY_SOME_P ())
                f->redisplay = true;
 
+             /* 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 (gcscrollbars && FRAME_TERMINAL (f)->judge_scroll_bars_hook)