diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2011-12-13 14:37:48 +0100 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2011-12-13 14:37:48 +0100 |
| commit | 454592a615ac4d86a6ce594945487642be5013d7 (patch) | |
| tree | 44ff04a72dfdb9acf478954bafcb53eea3c9db2b /src | |
| parent | 87393f2618610b11f406db76f41677475bec41cc (diff) | |
| download | emacs-454592a615ac4d86a6ce594945487642be5013d7.tar.gz | |
Minor fixes in window handling code and docs.
* window.c (Vwindow_combination_resize)
(Vwindow_combination_limit): Use t instead of non-nil in
doc-strings.
* window.el (delete-other-windows): Use correct frame in call to
window-with-parameter.
* windows.texi (Splitting Windows): Use t instead of non-nil
when describing window-combination-resize.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/window.c | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 221ba913a80..5cdbd528a2e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-12-13 Martin Rudalics <rudalics@gmx.at> + + * window.c (Vwindow_combination_resize) + (Vwindow_combination_limit): Use t instead of non-nil in + doc-strings. + 2011-12-11 Kenichi Handa <handa@m17n.org> * coding.c (Funencodable_char_position): Pay attention to the diff --git a/src/window.c b/src/window.c index b908749ea4a..f007aaf52cd 100644 --- a/src/window.c +++ b/src/window.c @@ -6506,22 +6506,24 @@ frame to be redrawn only if it is a tty frame. */); Vrecenter_redisplay = Qtty; DEFVAR_LISP ("window-combination-resize", Vwindow_combination_resize, - doc: /* Non-nil means resize window combinations proportionally. + doc: /* If t, resize window combinations proportionally. If this variable is nil, splitting a window gets the entire screen space for displaying the new window from the window to split. Deleting and resizing a window preferably resizes one adjacent window only. -If this variable is non-nil, splitting a window tries to get the space +If this variable is t, splitting a window tries to get the space proportionally from all windows in the same combination. This also allows to split a window that is otherwise too small or of fixed size. Resizing and deleting a window proportionally resize all windows in the same combination. +Other values are reserved for future use. + This variable takes no effect if `window-combination-limit' is non-nil. */); Vwindow_combination_resize = Qnil; DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit, - doc: /* Non-nil means splitting a window makes a new parent window. + doc: /* If t, splitting a window makes a new parent window. If this variable is nil, splitting a window will create a new parent window only if the window has no parent window or the window shall become a combination orthogonal to the one it is part of. |