From: Martin Rudalics <rudalics@gmx.at>
Date: Tue, 17 Jul 2007 07:27:27 +0000 (+0000)
Subject: (Fdisplay_buffer): If largest or LRU window is the
X-Git-Tag: emacs-pretest-23.0.90~11871
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71ec17e68295ebf6b570b17a7303612052bbd12b;p=emacs.git

(Fdisplay_buffer): If largest or LRU window is the
only window, split it even if it is not eligible for splitting.
This restores the original behavior broken by the 2007-07-15
change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e9f89ae554d..441f2c67922 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-17  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.c (Fdisplay_buffer): If largest or LRU window is the
+	only window, split it even if it is not eligible for splitting.
+	This restores the original behavior broken by the 2007-07-15
+	change.
+
 2007-07-17  Glenn Morris  <rgm@gnu.org>
 
 	* abbrev.c (abbrev_check_chars): New function.
diff --git a/src/window.c b/src/window.c
index c32b1a34f7d..8e75ef7f5d2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3738,12 +3738,13 @@ displayed.  */)
       else
 	window = Fget_largest_window (frames, Qt);
 
-      /* If we got a tall enough full-width window that can be split,
-	 split it.  */
+      /* If the largest window is tall enough, full-width, and either eligible
+	 for splitting or the only window, split it.  */
       if (!NILP (window)
 	  && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame))
 	  && WINDOW_FULL_WIDTH_P (XWINDOW (window))
-	  && window_height (window) >= split_height_threshold
+	  && (window_height (window) >= split_height_threshold
+	      || (NILP (XWINDOW (window)->parent)))
 	  && (window_height (window)
 	      >= (2 * window_min_size_2 (XWINDOW (window), 0))))
 	window = Fsplit_window (window, Qnil, Qnil);
@@ -3752,13 +3753,13 @@ displayed.  */)
 	  Lisp_Object upper, lower, other;
 
 	  window = Fget_lru_window (frames, Qt);
-	  /* If the LRU window is selected, and big enough,
-	     and can be split, split it.  */
+	  /* If the LRU window is tall enough, and either eligible for splitting
+	  and selected or the only window, split it.  */
 	  if (!NILP (window)
 	      && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame))
-	      && (EQ (window, selected_window)
-		  || NILP (XWINDOW (window)->parent))
-	      && window_height (window) >= split_height_threshold
+	      && ((EQ (window, selected_window)
+		   && window_height (window) >= split_height_threshold)
+		  || (NILP (XWINDOW (window)->parent)))
 	      && (window_height (window)
 		  >= (2 * window_min_size_2 (XWINDOW (window), 0))))
 	    window = Fsplit_window (window, Qnil, Qnil);
@@ -7601,4 +7602,4 @@ keys_of_window ()
 }
 
 /* arch-tag: 90a9c576-0590-48f1-a5f1-6c96a0452d9f
-   (do not change this comment) */
+   (do not change thisc omment) */