(freeze_window_start): Don't presume selected_window holds a window object.

diff --git a/src/ChangeLog b/src/ChangeLog
index 918b7bd191fd42b287f07e72222674c625f5030b..16c92b4d77adec00ce2d0ba934f096a17df735ab 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * frame.c (x_set_frame_parameters): Check number is positive before
+       using XFASTINT.
+
+       * window.c (freeze_window_start): Don't presume selected_window holds
+       a window object.
+
 2007-09-07  Angelo Graziosi <Angelo.Graziosi@roma1.infn.it>  (tiny change)
 
        * term.c (dissociate_if_controlling_tty): Call setsid on CYGWIN.

diff --git a/src/window.c b/src/window.c
index 2b33bf5803dd951f762ce5b4d9607d6f72c95e34..888da6f65622d5e36768774bb6b392fc7e04890a 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -7111,11 +7111,12 @@ freeze_window_start (w, freeze_p)
      struct window *w;
      void *freeze_p;
 {
-  if (w == XWINDOW (selected_window)
-      || MINI_WINDOW_P (w)
-      || (MINI_WINDOW_P (XWINDOW (selected_window))
-         && ! NILP (Vminibuf_scroll_window)
-         && w == XWINDOW (Vminibuf_scroll_window)))
+  if (MINI_WINDOW_P (w)
+      || (WINDOWP (selected_window) /* Can be nil in corner cases.  */
+         && (w == XWINDOW (selected_window)
+             || (MINI_WINDOW_P (XWINDOW (selected_window))
+                 && ! NILP (Vminibuf_scroll_window)
+                 && w == XWINDOW (Vminibuf_scroll_window)))))
     freeze_p = NULL;
 
   w->frozen_window_start_p = freeze_p != NULL;