[Emacs-diffs] emacs/src ChangeLog xdisp.c

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 09/06/18 09:49:08

Modified files:
        src            : ChangeLog xdisp.c 

Log message:
        (redisplay_internal): Check that the frame is still
        live after redisplay of its windows.
        (redisplay_windows): Check that the window is still live.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7580&r2=1.7581
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1287&r2=1.1288

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7580
retrieving revision 1.7581
diff -u -b -r1.7580 -r1.7581
--- ChangeLog   17 Jun 2009 00:42:17 -0000      1.7580
+++ ChangeLog   18 Jun 2009 09:49:05 -0000      1.7581
@@ -1,3 +1,9 @@
+2009-06-18  Andreas Schwab  <address@hidden>
+
+       * 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  <address@hidden>
 
        * coding.c (detect_coding_utf_16): Fix previous change.

Index: xdisp.c
===================================================================
RCS file: /sources/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1287
retrieving revision 1.1288
diff -u -b -r1.1287 -r1.1288
--- xdisp.c     14 Jun 2009 06:12:35 -0000      1.1287
+++ xdisp.c     18 Jun 2009 09:49:07 -0000      1.1288
@@ -11838,6 +11838,10 @@
              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 (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