comparison src/window.c @ 93407:da5b46bdd92c

(Fdisplay_buffer): Move call to Vsplit_window_preferred_function out of conditions that check if window is eligible for vertical splitting. When Vsplit_window_preferred_function is non-nil, call it and use its non-nil return value as window. Otherwise, continue doing vertical splitting using Fsplit_window with arg horflag=nil. (syms_of_window) <Vsplit_window_preferred_function>: Change the default value from `split-window' to nil.

93406:2428ecdc8ca0

#endif
	}
      else
	window = Fget_largest_window (frames, Qt);

      /* 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
		   || (NILP (XWINDOW (window)->parent)))
	  && (window_height (window)
	      >= (2 * window_min_size_2 (XWINDOW (window), 0))))
	window = call1 (Vsplit_window_preferred_function, window);
      else
	{
	  Lisp_Object upper, other;

	  window = Fget_lru_window (frames, Qt);
	  /* 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)
			&& window_height (window) >= split_height_threshold)
		       || (NILP (XWINDOW (window)->parent)))
		   && (window_height (window)
		       >= (2 * window_min_size_2 (XWINDOW (window), 0))))
	    window = call1 (Vsplit_window_preferred_function, window);
	  else
	    window = Fget_lru_window (frames, Qnil);
	  /* If Fget_lru_window returned nil, try other approaches.  */

	  /* Try visible frames first.  */

  DEFVAR_LISP ("split-window-preferred-function",
	       &Vsplit_window_preferred_function,
	       doc: /* Function to use to split a window.
This is used by `display-buffer' to allow the user to choose whether
to split windows horizontally or vertically or some mix of the two.
It is called with a window as single argument and should split it in two
and return the new window.  */);
  Vsplit_window_preferred_function = intern ("split-window");

  DEFVAR_INT ("window-min-height", &window_min_height,
	      doc: /* *Delete any window less than this tall (including its mode line).
The value is in line units. */);
  window_min_height = 4;

93407:da5b46bdd92c

#endif
	}
      else
	window = Fget_largest_window (frames, Qt);

      if (!NILP (Vsplit_window_preferred_function))
	tem = call1 (Vsplit_window_preferred_function, window);

      if (!NILP (tem))
	window = tem;
      else
	/* 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
		|| (NILP (XWINDOW (window)->parent)))
	    && (window_height (window)
		>= (2 * window_min_size_2 (XWINDOW (window), 0))))
	  window = Fsplit_window (window, Qnil, Qnil);
      else
	{
	  Lisp_Object upper, other;

	  window = Fget_lru_window (frames, Qt);
	  /* 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)
		   && 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);
	  else
	    window = Fget_lru_window (frames, Qnil);
	  /* If Fget_lru_window returned nil, try other approaches.  */

	  /* Try visible frames first.  */

  DEFVAR_LISP ("split-window-preferred-function",
	       &Vsplit_window_preferred_function,
	       doc: /* Function to use to split a window.
This is used by `display-buffer' to allow the user to choose whether
to split windows horizontally or vertically or some mix of the two.
When this variable is nil, `display-buffer' splits windows vertically.
Otherwise, `display-buffer' calls this function to split a window.
It is called with a window as single argument and should split it in two
and return the new window, or return an appropriate existing window
if splitting is not eligible.  */);
  Vsplit_window_preferred_function = Qnil;

  DEFVAR_INT ("window-min-height", &window_min_height,
	      doc: /* *Delete any window less than this tall (including its mode line).
The value is in line units. */);
  window_min_height = 4;