(Fdisplay_buffer): Fix last change to not use a dedicated window.

diff --git a/src/ChangeLog b/src/ChangeLog
index acf9681e002f9f0e988f58d365aeccb5a6f248a6..fd202cfd53ecef4e111f9cb116f719e65e3e158c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * window.c (Fdisplay_buffer): Fix last change to not use
+       a dedicated window.
+
 2005-11-01  Kim F. Storm  <storm@cua.dk>
 
        * fringe.c (update_window_fringes): Undo 2005-10-27 change.
@@ -62,8 +67,8 @@
        (decode_mode_spec): Test Vmemory_full, not spare_memory.
        (Fformat_mode_line): Clear mode_line_proptrans_alist after saving.
 
-       * lisp.h (memory_full_cons_threshold): Declared.
-       (internal_lisp_condition_case): Declared.
+       * lisp.h (memory_full_cons_threshold): Declare.
+       (internal_lisp_condition_case): Declare.
 
        * alloc.c (syms_of_alloc) <memory-full>: Doc fix.
        (Fmemory_full_p): Function deleted.

diff --git a/src/window.c b/src/window.c
index fe3572fba25425abc9a5b58f4591c7ce5834b322..c49493f37ca03082154ee8f000352348e170e9df 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -3535,6 +3535,8 @@ displayed.  */)
                  || EQ (XWINDOW (window)->parent, Qnil))
              && window_height (window) >= window_min_height << 1)
            window = Fsplit_window (window, Qnil, Qnil);
+         else
+           window = Fget_lru_window (frames, Qnil);
          /* If Fget_lru_window returned nil, try other approaches.  */
 
          /* Try visible frames first.  */