(freeze_window_start): Check that minibuffer scroll window isn't nil before

extracting the window structure pointer from it.

diff --git a/src/ChangeLog b/src/ChangeLog
index 52e876ea666bf3d94873a9e8f9f3ab2b7359d157..7e7ab6095950a249223bcf8f6c54daf78ea78b81 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2000-04-26  Ken Raeburn  <raeburn@gnu.org>
+
+       * window.c (freeze_window_start): Check that minibuffer scroll
+       window isn't nil before extracting the window structure pointer
+       from it.
+
+       * undo.c (record_delete): If we hit the end of the undo list, stop
+       picking elements apart.
+
 2000-04-26  Gerd Moellmann  <gerd@gnu.org>
 
        * xdisp.c (display_line): If lines are continued, restore

diff --git a/src/window.c b/src/window.c
index f156c4697038d7cd4d60c4d75b1d66725b4332dc..43ebb67c7dc512adcb1addbbcd0d392521578059 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -5045,6 +5045,7 @@ freeze_window_start (w, 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)))
     freeze_p = 0;