From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 17 Oct 1994 07:26:30 +0000 (+0000)
Subject: (Fdisplay_buffer): In desperation case of looking for
X-Git-Tag: emacs-19.34~6287
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=92cca945c470548a048bba9b4fa4ef5b2ee782eb;p=emacs.git

(Fdisplay_buffer): In desperation case of looking for
something to split, verify that a window's frame is splittable.
---

diff --git a/src/window.c b/src/window.c
index a4c6d7ebad1..fcb163f42fa 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1936,8 +1936,10 @@ Returns the window displaying BUFFER.")
 #endif
 	window = Fget_largest_window (frames);
 
-      /* If we got a tall enough full-width window, split it.  */
+      /* If we got a tall enough full-width window that can be split,
+	 split it.  */
       if (!NILP (window)
+	  && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame))
 	  && window_height (window) >= split_height_threshold
 	  && (XFASTINT (XWINDOW (window)->width)
 	      == FRAME_WIDTH (XFRAME (WINDOW_FRAME (XWINDOW (window))))))
@@ -1945,8 +1947,10 @@ Returns the window displaying BUFFER.")
       else
 	{
 	  window = Fget_lru_window (frames);
-	  /* If the LRU window is selected, and big enough, split it.  */
+	  /* If the LRU window is selected, and big enough,
+	     and can be split, split it.  */
 	  if (!NILP (window)
+	      && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame))
 	      && (EQ (window, selected_window)
 		  || EQ (XWINDOW (window)->parent, Qnil))
 	      && window_height (window) >= window_min_height << 1)