diff options
| author | Stefan Monnier <[email protected]> | 2007-09-07 19:45:15 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2007-09-07 19:45:15 +0000 |
| commit | 08c1d23533d1334ac3b5b57d8fe53c02d7c4a1e4 (patch) | |
| tree | 52f48a5d245eee58937e5b1a6a94e0c5585788d0 /src/window.c | |
| parent | 629c715ddf722b68e096f4569e23a9c270898dfa (diff) | |
(freeze_window_start): Don't presume selected_window holds a window object.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/window.c b/src/window.c index 2b33bf5803..888da6f656 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; |