From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Fri, 19 May 2006 09:12:26 +0000 (+0000)
Subject: (foreach_window): Check WINDOWP (FRAME_ROOT_WINDOW (f)).
X-Git-Tag: emacs-pretest-22.0.90~2493
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=76fb556f5255f6447bf855ad2925b17a85107e67;p=emacs.git

(foreach_window): Check WINDOWP (FRAME_ROOT_WINDOW (f)).
---

diff --git a/src/window.c b/src/window.c
index 2663b8d0d90..772ee18b08c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6796,7 +6796,9 @@ foreach_window (f, fn, user_data)
      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);
 }