2 files changed, 10 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 52e876ea666..7e7ab609595 100644
--- 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 f156c469703..43ebb67c7dc 100644
--- 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;