*** window.c	Mon Jul 16 14:58:10 2007
--- window.c	Mon Jul 16 14:59:28 2007
***************
*** 3743,3749 ****
        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)
  	      >= (2 * window_min_size_2 (XWINDOW (window), 0))))
  	window = Fsplit_window (window, Qnil, Qnil);
--- 3743,3750 ----
        if (!NILP (window)
  	  && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame))
  	  && WINDOW_FULL_WIDTH_P (XWINDOW (window))
! 	  && ((window_height (window) >= split_height_threshold)
! 	      || (EQ (XWINDOW (window)->parent, Qnil)))
  	  && (window_height (window)
  	      >= (2 * window_min_size_2 (XWINDOW (window), 0))))
  	window = Fsplit_window (window, Qnil, Qnil);
***************
*** 3756,3764 ****
  	     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) >= split_height_threshold
  	      && (window_height (window)
  		  >= (2 * window_min_size_2 (XWINDOW (window), 0))))
  	    window = Fsplit_window (window, Qnil, Qnil);
--- 3757,3765 ----
  	     and can be split, split it.  */
  	  if (!NILP (window)
  	      && ! FRAME_NO_SPLIT_P (XFRAME (XWINDOW (window)->frame))
! 	      && (((EQ (window, selected_window))
! 		   && (window_height (window) >= split_height_threshold))
! 		  || (EQ (XWINDOW (window)->parent, Qnil)))
  	      && (window_height (window)
  		  >= (2 * window_min_size_2 (XWINDOW (window), 0))))
  	    window = Fsplit_window (window, Qnil, Qnil);