From: Stefan Monnier Date: Fri, 7 Sep 2007 19:45:15 +0000 (+0000) Subject: (freeze_window_start): Don't presume selected_window holds a window object. X-Git-Tag: emacs-pretest-23.0.90~11035 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=08c1d23533d1334ac3b5b57d8fe53c02d7c4a1e4;p=emacs.git (freeze_window_start): Don't presume selected_window holds a window object. --- diff --git a/src/ChangeLog b/src/ChangeLog index 918b7bd191f..16c92b4d77a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2007-09-07 Stefan Monnier + + * 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 (tiny change) * term.c (dissociate_if_controlling_tty): Call setsid on CYGWIN. diff --git a/src/window.c b/src/window.c index 2b33bf5803d..888da6f6562 100644 --- 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;