[Emacs-diffs] Changes to emacs/src/window.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/window.c
diff -u emacs/src/window.c:1.544 emacs/src/window.c:1.545
--- emacs/src/window.c:1.544    Fri Apr 21 11:55:17 2006
+++ emacs/src/window.c  Fri May 19 09:12:26 2006
@@ -6796,7 +6796,9 @@
      int (* fn) P_ ((struct window *, void *));
      void *user_data;
 {
-  foreach_window_1 (XWINDOW (FRAME_ROOT_WINDOW (f)), fn, user_data);
+  /* Fdelete_frame may set FRAME_ROOT_WINDOW (f) to Qnil.  */
+  if (WINDOWP (FRAME_ROOT_WINDOW (f)))
+    foreach_window_1 (XWINDOW (FRAME_ROOT_WINDOW (f)), fn, user_data);
 }