From: Martin Rudalics Date: Wed, 7 Nov 2012 09:41:52 +0000 (+0100) Subject: Fix and rewrite doc on window recombining facilities. X-Git-Tag: emacs-24.2.90~147 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fdaf534a7b1f94563065f0136cb7bac981722877;p=emacs.git Fix and rewrite doc on window recombining facilities. * window.c (Fsplit_window_internal): Set combination limit of new parent window to t iff Vwindow_combination_limit is t; fixing a regression introduced with the change from 2012-09-22. (Fwindow_combination_limit, Fset_window_combination_limit): Fix doc-strings. * elisp.texi (Top): Add Recombining Windows to menu. * windows.texi (Recombining Windows): New subsection. (Splitting Windows): Rewrite text on handling of window combinations and move it to new subsection. --- diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 9af670dc6cc..1339e727bd8 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,10 @@ +2012-11-07 Martin Rudalics + + * elisp.texi (Top): Add Recombining Windows to menu. + * windows.texi (Recombining Windows): New subsection. + (Splitting Windows): Rewrite text on handling of window + combinations and move it to new subsection. + 2012-11-07 Chong Yidong * variables.texi (Creating Buffer-Local): Document setq-local and diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 5f10b450e84..a70558bf09f 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -1001,6 +1001,8 @@ Windows * Resizing Windows:: Changing the sizes of windows. * Splitting Windows:: Splitting one window into two windows. * Deleting Windows:: Deleting a window gives its space to other windows. +* Recombining Windows:: Preserving the frame layout when splitting and + deleting windows. * Selecting Windows:: The selected window is the one that you edit in. * Cyclic Window Ordering:: Moving around the existing windows. * Buffers and Windows:: Each window displays the contents of a buffer. diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 2fbb59cd1dd..bb02b1d54fd 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -16,8 +16,10 @@ is displayed in windows. * Windows and Frames:: Relating windows to the frame they appear on. * Window Sizes:: Accessing a window's size. * Resizing Windows:: Changing the sizes of windows. -* Splitting Windows:: Splitting one window into two windows. -* Deleting Windows:: Deleting a window gives its space to other windows. +* Splitting Windows:: Creating a new window. +* Deleting Windows:: Removing a window from its frame. +* Recombining Windows:: Preserving the frame layout when splitting and + deleting windows. * Selecting Windows:: The selected window is the one that you edit in. * Cyclic Window Ordering:: Moving around the existing windows. * Buffers and Windows:: Each window displays the contents of a buffer. @@ -587,7 +589,7 @@ function @code{window-resizable} above. The choice of which window edges this function alters depends on the values of the option @code{window-combination-resize} and the combination limits of the involved windows; in some cases, it may alter -both edges. @xref{Splitting Windows}. To resize by moving only the +both edges. @xref{Recombining Windows}. To resize by moving only the bottom or right edge of a window, use the function @code{adjust-window-trailing-edge}, below. @end defun @@ -795,26 +797,169 @@ A new live window @var{W2} is created, to the left of the internal window @var{W3}. A new internal window @var{W1} is created, becoming the new root window. -@defopt window-combination-resize -If this variable is @code{nil}, @code{split-window} can only split a -window (denoted by @var{window}) if @var{window}'s screen area is large -enough to accommodate both itself and the new window. + For interactive use, Emacs provides two commands which always split +the selected window. These call @code{split-window} internally. -If this variable is @code{t}, @code{split-window} tries to resize all -windows that are part of the same combination as @var{window}, in order -to accommodate the new window. In particular, this may allow -@code{split-window} to succeed even if @var{window} is a fixed-size -window or too small to ordinarily split. Furthermore, subsequently -resizing or deleting @var{window} may resize all other windows in its -combination. +@deffn Command split-window-right &optional size +This function splits the selected window into two side-by-side +windows, putting the selected window on the left. If @var{size} is +positive, the left window gets @var{size} columns; if @var{size} is +negative, the right window gets @minus{}@var{size} columns. +@end deffn -The default is @code{nil}. Other values are reserved for future use. -The value of this variable is ignored when -@code{window-combination-limit} is non-@code{nil} (see below). +@deffn Command split-window-below &optional size +This function splits the selected window into two windows, one above +the other, leaving the upper window selected. If @var{size} is +positive, the upper window gets @var{size} lines; if @var{size} is +negative, the lower window gets @minus{}@var{size} lines. +@end deffn + +@defopt split-window-keep-point +If the value of this variable is non-@code{nil} (the default), +@code{split-window-below} behaves as described above. + +If it is @code{nil}, @code{split-window-below} adjusts point in each +of the two windows to minimize redisplay. (This is useful on slow +terminals.) It selects whichever window contains the screen line that +point was previously on. Note that this only affects +@code{split-window-below}, not the lower-level @code{split-window} +function. @end defopt - To illustrate the effect of @code{window-combination-resize}, -consider the following window configuration: +@node Deleting Windows +@section Deleting Windows +@cindex deleting windows + + @dfn{Deleting} a window removes it from the frame's window tree. If +the window is a live window, it disappears from the screen. If the +window is an internal window, its child windows are deleted too. + + Even after a window is deleted, it continues to exist as a Lisp +object, until there are no more references to it. Window deletion can +be reversed, by restoring a saved window configuration (@pxref{Window +Configurations}). + +@deffn Command delete-window &optional window +This function removes @var{window} from display and returns +@code{nil}. If @var{window} is omitted or @code{nil}, it defaults to +the selected window. If deleting the window would leave no more +windows in the window tree (e.g. if it is the only live window in the +frame), an error is signaled. + +By default, the space taken up by @var{window} is given to one of its +adjacent sibling windows, if any. However, if the variable +@code{window-combination-resize} is non-@code{nil}, the space is +proportionally distributed among any remaining windows in the window +combination. @xref{Recombining Windows}. + +The behavior of this function may be altered by the window parameters +of @var{window}, so long as the variable +@code{ignore-window-parameters} is @code{nil}. If the value of +the @code{delete-window} window parameter is @code{t}, this function +ignores all other window parameters. Otherwise, if the value of the +@code{delete-window} window parameter is a function, that function is +called with the argument @var{window}, in lieu of the usual action of +@code{delete-window}. Otherwise, this function obeys the +@code{window-atom} or @code{window-side} window parameter, if any. +@xref{Window Parameters}. +@end deffn + +@deffn Command delete-other-windows &optional window +This function makes @var{window} fill its frame, by deleting other +windows as necessary. If @var{window} is omitted or @code{nil}, it +defaults to the selected window. The return value is @code{nil}. + +The behavior of this function may be altered by the window parameters +of @var{window}, so long as the variable +@code{ignore-window-parameters} is @code{nil}. If the value of +the @code{delete-other-windows} window parameter is @code{t}, this +function ignores all other window parameters. Otherwise, if the value +of the @code{delete-other-windows} window parameter is a function, +that function is called with the argument @var{window}, in lieu of the +usual action of @code{delete-other-windows}. Otherwise, this function +obeys the @code{window-atom} or @code{window-side} window parameter, +if any. @xref{Window Parameters}. +@end deffn + +@deffn Command delete-windows-on &optional buffer-or-name frame +This function deletes all windows showing @var{buffer-or-name}, by +calling @code{delete-window} on those windows. @var{buffer-or-name} +should be a buffer, or the name of a buffer; if omitted or @code{nil}, +it defaults to the current buffer. If there are no windows showing +the specified buffer, this function does nothing. If the specified +buffer is a minibuffer, an error is signaled. + +If there is a dedicated window showing the buffer, and that window is +the only one on its frame, this function also deletes that frame if it +is not the only frame on the terminal. + +The optional argument @var{frame} specifies which frames to operate +on: + +@itemize @bullet +@item @code{nil} +means operate on all frames. +@item @code{t} +means operate on the selected frame. +@item @code{visible} +means operate on all visible frames. +@item @code{0} +means operate on all visible or iconified frames. +@item A frame +means operate on that frame. +@end itemize + +Note that this argument does not have the same meaning as in other +functions which scan all live windows (@pxref{Cyclic Window +Ordering}). Specifically, the meanings of @code{t} and @code{nil} here +are the opposite of what they are in those other functions. +@end deffn + + +@node Recombining Windows +@section Recombining Windows + +When deleting the last sibling of a window @code{W}, its parent window +is deleted too, with @code{W} replacing it in the window tree. This +means that @code{W} must be recombined with its parent's siblings to +form a new window combination (@pxref{Windows and Frames}). In some +occasions, deleting a live window may even entail the deletion of two +internal windows. + +@smallexample +@group + ______________________________________ + | ______ ____________________________ | + || || __________________________ || + || ||| ___________ ___________ ||| + || |||| || |||| + || ||||____W6_____||_____W7____|||| + || |||____________W4____________||| + || || __________________________ || + || ||| ||| + || ||| ||| + || |||____________W5____________||| + ||__W2__||_____________W3_____________ | + |__________________W1__________________| + +@end group +@end smallexample + +@noindent +Deleting @code{W5} in this configuration normally causes the deletion of +@code{W3} and @code{W4}. The remaining live windows @code{W2}, +@code{W6} and @code{W7} are recombined to form a new horizontal +combination with parent @code{W1}. + + Sometimes, however, it makes sense to not delete a parent window like +@code{W4}. In particular, a parent window should not be removed when it +was used to preserve a combination embedded in a combination of the same +type. Such embeddings make sense to assure that when you split a window +and subsequently delete the new window, Emacs reestablishes the layout +of the associated frame as it existed before the splitting. + + Consider a scenario starting with two live windows @code{W2} and +@code{W3} and their parent @code{W1}. @smallexample @group @@ -824,10 +969,10 @@ consider the following window configuration: || || || || || || - ||_________________W2_________________|| - | ____________________________________ | || || || || + ||_________________W2_________________|| + | ____________________________________ | || || || || ||_________________W3_________________|| @@ -837,8 +982,7 @@ consider the following window configuration: @end smallexample @noindent -If @code{window-combination-resize} is @code{nil}, splitting window -@code{W3} leaves the size of @code{W2} unchanged: +Split @code{W2} to make a new window @code{W4} as follows. @smallexample @group @@ -846,24 +990,25 @@ If @code{window-combination-resize} is @code{nil}, splitting window | ____________________________________ | || || || || - || || - || || ||_________________W2_________________|| | ____________________________________ | || || - ||_________________W3_________________|| - | ____________________________________ | || || ||_________________W4_________________|| + | ____________________________________ | + || || + || || + ||_________________W3_________________|| |__________________W1__________________| @end group @end smallexample @noindent -If @code{window-combination-resize} is @code{t}, splitting @code{W3} -instead leaves all three live windows with approximately the same -height: +Now, when enlarging a window vertically, Emacs tries to obtain the +corresponding space from its lower sibling, provided such a window +exists. In our scenario, enlarging @code{W4} will steal space from +@code{W3}. @smallexample @group @@ -875,36 +1020,119 @@ height: | ____________________________________ | || || || || + || || + || || + ||_________________W4_________________|| + | ____________________________________ | ||_________________W3_________________|| + |__________________W1__________________| + +@end group +@end smallexample + +@noindent +Deleting @code{W4} will now give its entire space to @code{W2}, +including the space earlier stolen from @code{W3}. + +@smallexample +@group + ______________________________________ | ____________________________________ | || || || || - ||_________________W4_________________|| + || || + || || + || || + || || + || || + || || + ||_________________W2_________________|| + | ____________________________________ | + ||_________________W3_________________|| |__________________W1__________________| @end group @end smallexample +@noindent +This can be counterintutive, in particular if @code{W4} were used for +displaying a buffer only temporarily (@pxref{Temporary Displays}), and +you want to continue working with the initial layout. + +The behavior can be fixed by making a new parent window when splitting +@code{W2}. The variable described next allows to do that. + @defopt window-combination-limit -If the value of this variable is @code{t}, the @code{split-window} -function always creates a new internal window. If the value is -@code{nil}, the new live window is allowed to share the existing +This variable controls whether splitting a window shall make a new +parent window. The following values are recognized: + +@table @code +@item nil +This means that the new live window is allowed to share the existing parent window, if one exists, provided the split occurs in the same -direction as the existing window combination (otherwise, a new -internal window is created anyway). The default is @code{nil}. Other -values are reserved for future use. - -Thus, if the value of this variable is at all times @code{t}, then at -all times every window tree is a binary tree (a tree where each window -except the root window has exactly one sibling). - -Furthermore, @code{split-window} calls -@code{set-window-combination-limit} on the newly-created internal -window, recording the current value of this variable. This affects -how the window tree is rearranged when the child windows are deleted -(see below). +direction as the existing window combination (otherwise, a new internal +window is created anyway). + +@item window-size +In this case @code{display-buffer} makes a new parent window if it is +passed a @code{window-height} or @code{window-width} entry in the +@var{alist} argument (@pxref{Display Action Functions}). + +@item temp-buffer +This value causes the creation of a new parent window when a window is +split for showing a temporary buffer (@pxref{Temporary Displays}) only. + +@item display-buffer +This means that when @code{display-buffer} (@pxref{Choosing Window}) +splits a window it always makes a new parent window. + +@item t +In this case a new parent window is always created when splitting a +window. Thus, if the value of this variable is at all times @code{t}, +then at all times every window tree is a binary tree (a tree where each +window except the root window has exactly one sibling). +@end table + +The default is @code{nil}. Other values are reserved for future use. + +If, as a consequence of this variable's setting, @code{split-window} +makes a new parent window, it also calls +@code{set-window-combination-limit} (see below) on the newly-created +internal window. This affects how the window tree is rearranged when +the child windows are deleted (see below). @end defopt + If @code{window-combination-limit} is @code{t}, splitting @code{W2} in +the initial configuration of our scenario would have produced this: + +@smallexample +@group + ______________________________________ + | ____________________________________ | + || __________________________________ || + ||| ||| + |||________________W2________________||| + || __________________________________ || + ||| ||| + |||________________W4________________||| + ||_________________W5_________________|| + | ____________________________________ | + || || + || || + ||_________________W3_________________|| + |__________________W1__________________| + +@end group +@end smallexample + +@noindent +A new internal window @code{W5} has been created; its children are +@code{W2} and the new live window @code{W4}. Now, @code{W2} is the only +sibling of @code{W4}, so enlarging @code{W4} will try to shrink +@code{W2}, leaving @code{W3} unaffected. Observe that @code{W5} +represents a vertical combination of two windows embedded in the +vertical combination @code{W1}. + @cindex window combination limit @defun set-window-combination-limit window limit This functions sets the @dfn{combination limit} of the window @@ -912,25 +1140,52 @@ This functions sets the @dfn{combination limit} of the window function @code{window-combination-limit}. See below for its effects; note that it is only meaningful for internal windows. The @code{split-window} function automatically calls this function, passing -the value of the variable @code{window-combination-limit} as -@var{limit}. +it @code{t} as @var{limit}, provided the value of the variable +@code{window-combination-limit} is @code{t} when it is called. @end defun @defun window-combination-limit window This function returns the combination limit for @var{window}. -The combination limit is meaningful only for an internal window. If -it is @code{nil}, then Emacs is allowed to automatically delete +The combination limit is meaningful only for an internal window. If it +is @code{nil}, then Emacs is allowed to automatically delete @var{window}, in response to a window deletion, in order to group the child windows of @var{window} with its sibling windows to form a new window combination. If the combination limit is @code{t}, the child -windows of @var{window} are never automatically re-combined with its +windows of @var{window} are never automatically recombined with its siblings. + +If, in the configuration shown at the beginning of this section, the +combination limit of @code{W4} (the parent window of @code{W6} and +@code{W7}) is @code{t}, deleting @code{W5} will not implicitly delete +@code{W4} too. @end defun - To illustrate the effect of @code{window-combination-limit}, -consider the following configuration (throughout this example, we will -assume that @code{window-combination-resize} is @code{nil}): +Alternatively, the problems sketched above can be avoided by always +resizing all windows in the same combination whenever one of its windows +is split or deleted. This also permits to split windows that would be +otherwise too small for such an operation. + +@defopt window-combination-resize +If this variable is @code{nil}, @code{split-window} can only split a +window (denoted by @var{window}) if @var{window}'s screen area is large +enough to accommodate both itself and the new window. + +If this variable is @code{t}, @code{split-window} tries to resize all +windows that are part of the same combination as @var{window}, in order +to accommodate the new window. In particular, this may allow +@code{split-window} to succeed even if @var{window} is a fixed-size +window or too small to ordinarily split. Furthermore, subsequently +resizing or deleting @var{window} may resize all other windows in its +combination. + +The default is @code{nil}. Other values are reserved for future use. +The value of this variable is ignored when +@code{window-combination-limit} is non-@code{nil}. +@end defopt + + To illustrate the effect of @code{window-combination-resize}, consider +the following frame layout. @smallexample @group @@ -940,12 +1195,12 @@ assume that @code{window-combination-resize} is @code{nil}): || || || || || || - || || - || || ||_________________W2_________________|| | ____________________________________ | || || || || + || || + || || ||_________________W3_________________|| |__________________W1__________________| @@ -953,8 +1208,8 @@ assume that @code{window-combination-resize} is @code{nil}): @end smallexample @noindent -If @code{window-combination-limit} is @code{nil}, splitting @code{W2} -into two windows, one above the other, yields +If @code{window-combination-resize} is @code{nil}, splitting window +@code{W3} leaves the size of @code{W2} unchanged: @smallexample @group @@ -962,171 +1217,50 @@ into two windows, one above the other, yields | ____________________________________ | || || || || - ||_________________W2_________________|| - | ____________________________________ | || || || || - ||_________________W4_________________|| + ||_________________W2_________________|| | ____________________________________ | || || - || || ||_________________W3_________________|| + | ____________________________________ | + || || + ||_________________W4_________________|| |__________________W1__________________| @end group @end smallexample @noindent -The newly-created window, @code{W4}, shares the same internal window -@code{W1}. If @code{W4} is resized, it is allowed to resize the other -live window, @code{W3}. - - If @code{window-combination-limit} is @code{t}, splitting @code{W2} -in the initial configuration would instead have produced this: +If @code{window-combination-resize} is @code{t}, splitting @code{W3} +instead leaves all three live windows with approximately the same +height: @smallexample @group ______________________________________ | ____________________________________ | - || __________________________________ || - ||| ||| - |||________________W2________________||| - || __________________________________ || - ||| ||| - |||________________W4________________||| - ||_________________W5_________________|| + || || + || || + ||_________________W2_________________|| | ____________________________________ | || || || || ||_________________W3_________________|| + | ____________________________________ | + || || + || || + ||_________________W4_________________|| |__________________W1__________________| @end group @end smallexample @noindent -A new internal window @code{W5} has been created; its children are -@code{W2} and the new live window @code{W4}. Now, @code{W2} is the -only sibling of @code{W4}, so resizing @code{W4} will resize -@code{W2}, leaving @code{W3} unaffected. - - For interactive use, Emacs provides two commands which always split -the selected window. These call @code{split-window} internally. - -@deffn Command split-window-right &optional size -This function splits the selected window into two side-by-side -windows, putting the selected window on the left. If @var{size} is -positive, the left window gets @var{size} columns; if @var{size} is -negative, the right window gets @minus{}@var{size} columns. -@end deffn - -@deffn Command split-window-below &optional size -This function splits the selected window into two windows, one above -the other, leaving the upper window selected. If @var{size} is -positive, the upper window gets @var{size} lines; if @var{size} is -negative, the lower window gets @minus{}@var{size} lines. -@end deffn - -@defopt split-window-keep-point -If the value of this variable is non-@code{nil} (the default), -@code{split-window-below} behaves as described above. +Deleting any of the live windows @code{W2}, @code{W3} or @code{W4} will +distribute its space proportionally among the two remaining live +windows. -If it is @code{nil}, @code{split-window-below} adjusts point in each -of the two windows to minimize redisplay. (This is useful on slow -terminals.) It selects whichever window contains the screen line that -point was previously on. Note that this only affects -@code{split-window-below}, not the lower-level @code{split-window} -function. -@end defopt - -@node Deleting Windows -@section Deleting Windows -@cindex deleting windows - - @dfn{Deleting} a window removes it from the frame's window tree. If -the window is a live window, it disappears from the screen. If the -window is an internal window, its child windows are deleted too. - - Even after a window is deleted, it continues to exist as a Lisp -object, until there are no more references to it. Window deletion can -be reversed, by restoring a saved window configuration (@pxref{Window -Configurations}). - -@deffn Command delete-window &optional window -This function removes @var{window} from display and returns -@code{nil}. If @var{window} is omitted or @code{nil}, it defaults to -the selected window. If deleting the window would leave no more -windows in the window tree (e.g. if it is the only live window in the -frame), an error is signaled. - -By default, the space taken up by @var{window} is given to one of its -adjacent sibling windows, if any. However, if the variable -@code{window-combination-resize} is non-@code{nil}, the space is -proportionally distributed among any remaining windows in the window -combination. @xref{Splitting Windows}. - -The behavior of this function may be altered by the window parameters -of @var{window}, so long as the variable -@code{ignore-window-parameters} is @code{nil}. If the value of -the @code{delete-window} window parameter is @code{t}, this function -ignores all other window parameters. Otherwise, if the value of the -@code{delete-window} window parameter is a function, that function is -called with the argument @var{window}, in lieu of the usual action of -@code{delete-window}. Otherwise, this function obeys the -@code{window-atom} or @code{window-side} window parameter, if any. -@xref{Window Parameters}. -@end deffn - -@deffn Command delete-other-windows &optional window -This function makes @var{window} fill its frame, by deleting other -windows as necessary. If @var{window} is omitted or @code{nil}, it -defaults to the selected window. The return value is @code{nil}. - -The behavior of this function may be altered by the window parameters -of @var{window}, so long as the variable -@code{ignore-window-parameters} is @code{nil}. If the value of -the @code{delete-other-windows} window parameter is @code{t}, this -function ignores all other window parameters. Otherwise, if the value -of the @code{delete-other-windows} window parameter is a function, -that function is called with the argument @var{window}, in lieu of the -usual action of @code{delete-other-windows}. Otherwise, this function -obeys the @code{window-atom} or @code{window-side} window parameter, -if any. @xref{Window Parameters}. -@end deffn - -@deffn Command delete-windows-on &optional buffer-or-name frame -This function deletes all windows showing @var{buffer-or-name}, by -calling @code{delete-window} on those windows. @var{buffer-or-name} -should be a buffer, or the name of a buffer; if omitted or @code{nil}, -it defaults to the current buffer. If there are no windows showing -the specified buffer, this function does nothing. If the specified -buffer is a minibuffer, an error is signaled. - -If there is a dedicated window showing the buffer, and that window is -the only one on its frame, this function also deletes that frame if it -is not the only frame on the terminal. - -The optional argument @var{frame} specifies which frames to operate -on: - -@itemize @bullet -@item @code{nil} -means operate on all frames. -@item @code{t} -means operate on the selected frame. -@item @code{visible} -means operate on all visible frames. -@item @code{0} -means operate on all visible or iconified frames. -@item A frame -means operate on that frame. -@end itemize - -Note that this argument does not have the same meaning as in other -functions which scan all live windows (@pxref{Cyclic Window -Ordering}). Specifically, the meanings of @code{t} and @code{nil} here -are the opposite of what they are in those other functions. -@end deffn @node Selecting Windows @section Selecting Windows diff --git a/etc/NEWS b/etc/NEWS index 76126cf6dda..79fc95b4848 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -834,7 +834,7 @@ recursive invocations. +++ *** The functions get-lru-window, get-mru-window and get-largest-window now accept a third argument to avoid choosing the selected window. - ++++ *** Additional values recognized for option `window-combination-limit'. *** New macro `with-temp-buffer-window'. diff --git a/src/ChangeLog b/src/ChangeLog index 11e657cffa9..9e0f92f557e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2012-11-07 Martin Rudalics + + * window.c (Fsplit_window_internal): Set combination limit of + new parent window to t iff Vwindow_combination_limit is t; + fixing a regression introduced with the change from 2012-09-22. + (Fwindow_combination_limit, Fset_window_combination_limit): Fix + doc-strings. + 2012-11-06 Eli Zaretskii * xdisp.c (try_scrolling): Fix correction of aggressive-scroll diff --git a/src/window.c b/src/window.c index dfcabda59b9..4981b8cd7c0 100644 --- a/src/window.c +++ b/src/window.c @@ -600,10 +600,12 @@ Return nil if WINDOW has no previous sibling. */) DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 1, 1, 0, doc: /* Return combination limit of window WINDOW. -WINDOW must be a valid window and defaults to the selected one. -If the return value is nil, child windows of WINDOW can be recombined with -WINDOW's siblings. A return value of t means that child windows of -WINDOW are never \(re-)combined with WINDOW's siblings. */) +If the return value is nil, child windows of WINDOW can be recombined +with WINDOW's siblings. A return value of t means that child windows of +WINDOW are never \(re-)combined with WINDOW's siblings. + +WINDOW must be a valid window. The return value is meaningful for +internal windows only. */) (Lisp_Object window) { return decode_valid_window (window)->combination_limit; @@ -611,11 +613,13 @@ WINDOW are never \(re-)combined with WINDOW's siblings. */) DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0, doc: /* Set combination limit of window WINDOW to LIMIT; return LIMIT. -WINDOW must be a valid window and defaults to the selected one. If LIMIT is nil, child windows of WINDOW can be recombined with WINDOW's siblings. LIMIT t means that child windows of WINDOW are never \(re-)combined with WINDOW's siblings. Other values are reserved for -future use. */) +future use. + +WINDOW must be a valid window. Setting the combination limit is +meaningful for internal windows only. */) (Lisp_Object window, Lisp_Object limit) { wset_combination_limit (decode_valid_window (window), limit); @@ -3892,9 +3896,10 @@ set correctly. See the code of `split-window' for how this is done. */) make_parent_window (old, horflag); p = XWINDOW (o->parent); - /* Store t in the new parent's combination_limit slot to avoid - that its children get merged into another window. */ - wset_combination_limit (p, Qt); + if (EQ (Vwindow_combination_limit, Qt)) + /* Store t in the new parent's combination_limit slot to avoid + that its children get merged into another window. */ + wset_combination_limit (p, Qt); /* These get applied below. */ wset_new_total (p, horflag ? o->total_cols : o->total_lines); wset_new_normal (p, new_normal);