(window_loop): Don't check for Fother_buffer returning nil.

2 files changed, 8 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5045871d930..f8b2daf929c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-15  Gerd Moellmann  <gerd@gnu.org>
+
+        * window.c (window_loop): Don't check for Fother_buffer returning
+        nil.
+        
+        * window.c (select_window_1): Unfreeze window start.  Remove a
+        doubled test for WINDOW being live.
+
 2001-10-15  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
         * fns.c (Fmapconcat): Fix typo in a doc string.
diff --git a/src/window.c b/src/window.c
index 8f7dd74cf88..4c629113d9d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1854,8 +1854,6 @@ window_loop (type, obj, mini, frames)
                        display there.  */
                     Lisp_Object buffer;
                     buffer = Fother_buffer (obj, Qnil, w->frame);
-                    if (NILP (buffer))
-                      buffer = Fget_buffer_create (build_string ("*scratch*"));
                     Fset_window_buffer (window, buffer);
                     if (EQ (window, selected_window))
                       Fset_buffer (w->buffer);
@@ -1891,8 +1889,6 @@ window_loop (type, obj, mini, frames)
                 
                 /* Find another buffer to show in this window.  */
                 buffer = Fother_buffer (obj, Qnil, w->frame);
-                if (NILP (buffer))
-                  buffer = Fget_buffer_create (build_string ("*scratch*"));
                 
                 /* If this window is dedicated, and in a frame of its own,
                    kill the frame.  */