[Emacs-diffs] Changes to emacs/src/window.c [lexbind]

[Miles Bader]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.417.2.10 emacs/src/window.c:1.417.2.11
*** emacs/src/window.c:1.417.2.10       Tue May 11 02:39:15 2004
--- emacs/src/window.c  Tue Jul  6 09:14:39 2004
***************
*** 3270,3275 ****
--- 3270,3279 ----
   unless `pop-up-frames' or `display-buffer-reuse-frames' is non-nil,
   which means search visible and iconified frames.
  
+ If a full-width window on a splittable frame is available to display
+ the buffer, it may be split, subject to the value of the variable
+ `split-height-threshold'.
+ 
  If `even-window-heights' is non-nil, window heights will be evened out
  if displaying the buffer causes two vertically adjacent windows to be
  displayed.  */)
***************
*** 3585,3591 ****
  WINDOW defaults to selected one and SIZE to half its size.
  If optional third arg HORFLAG is non-nil, split side by side
  and put SIZE columns in the first of the pair.  In that case,
! SIZE includes that window's scroll bar, or the divider column to its right.  
*/)
       (window, size, horflag)
       Lisp_Object window, size, horflag;
  {
--- 3589,3596 ----
  WINDOW defaults to selected one and SIZE to half its size.
  If optional third arg HORFLAG is non-nil, split side by side
  and put SIZE columns in the first of the pair.  In that case,
! SIZE includes that window's scroll bar, or the divider column to its right.
! Returns the newly-created window.  */)
       (window, size, horflag)
       Lisp_Object window, size, horflag;
  {
***************
*** 6592,6598 ****
    next_screen_context_lines = 2;
  
    DEFVAR_INT ("split-height-threshold", &split_height_threshold,
!             doc: /* *display-buffer would prefer to split the largest window 
if this large.
  If there is only one window, it is split regardless of this value.  */);
    split_height_threshold = 500;
  
--- 6597,6603 ----
    next_screen_context_lines = 2;
  
    DEFVAR_INT ("split-height-threshold", &split_height_threshold,
!             doc: /* *A window must be at least this tall to be eligible for 
splitting by `display-buffer'.
  If there is only one window, it is split regardless of this value.  */);
    split_height_threshold = 500;