diff options
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/window.c b/src/window.c index 86fcca25f2e..4f573a67909 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -5000,7 +5000,7 @@ the selected window; if the variable `recenter-redisplay' is non-nil, | |||
| 5000 | also erase the entire frame and redraw it (when `auto-resize-tool-bars' | 5000 | also erase the entire frame and redraw it (when `auto-resize-tool-bars' |
| 5001 | is set to `grow-only', this resets the tool-bar's height to the minimum | 5001 | is set to `grow-only', this resets the tool-bar's height to the minimum |
| 5002 | height needed); if `recenter-redisplay' has the special value `tty', | 5002 | height needed); if `recenter-redisplay' has the special value `tty', |
| 5003 | then only tty frame are redrawn. | 5003 | then only tty frames are redrawn. |
| 5004 | 5004 | ||
| 5005 | Just C-u as prefix means put point in the center of the window | 5005 | Just C-u as prefix means put point in the center of the window |
| 5006 | and redisplay normally--don't erase and redraw the frame. */) | 5006 | and redisplay normally--don't erase and redraw the frame. */) |
| @@ -5772,7 +5772,7 @@ get_leaf_windows (struct window *w, struct window **flat, int i) | |||
| 5772 | 5772 | ||
| 5773 | 5773 | ||
| 5774 | /* Return a pointer to the glyph W's physical cursor is on. Value is | 5774 | /* Return a pointer to the glyph W's physical cursor is on. Value is |
| 5775 | null if W's current matrix is invalid, so that no meaningfull glyph | 5775 | null if W's current matrix is invalid, so that no meaningful glyph |
| 5776 | can be returned. */ | 5776 | can be returned. */ |
| 5777 | struct glyph * | 5777 | struct glyph * |
| 5778 | get_phys_cursor_glyph (struct window *w) | 5778 | get_phys_cursor_glyph (struct window *w) |
| @@ -6505,28 +6505,31 @@ with the relevant frame selected. */); | |||
| 6505 | Vwindow_configuration_change_hook = Qnil; | 6505 | Vwindow_configuration_change_hook = Qnil; |
| 6506 | 6506 | ||
| 6507 | DEFVAR_LISP ("recenter-redisplay", Vrecenter_redisplay, | 6507 | DEFVAR_LISP ("recenter-redisplay", Vrecenter_redisplay, |
| 6508 | doc: /* If non-nil, then the `recenter' command with a nil argument | 6508 | doc: /* Non-nil means `recenter' redraws entire frame. |
| 6509 | will redraw the entire frame; the special value `tty' causes the | 6509 | If this option is non-nil, then the `recenter' command with a nil |
| 6510 | frame to be redrawn only if it is a tty frame. */); | 6510 | argument will redraw the entire frame; the special value `tty' causes |
| 6511 | the frame to be redrawn only if it is a tty frame. */); | ||
| 6511 | Vrecenter_redisplay = Qtty; | 6512 | Vrecenter_redisplay = Qtty; |
| 6512 | 6513 | ||
| 6513 | DEFVAR_LISP ("window-combination-resize", Vwindow_combination_resize, | 6514 | DEFVAR_LISP ("window-combination-resize", Vwindow_combination_resize, |
| 6514 | doc: /* Non-nil means resize window combinations proportionally. | 6515 | doc: /* If t, resize window combinations proportionally. |
| 6515 | If this variable is nil, splitting a window gets the entire screen space | 6516 | If this variable is nil, splitting a window gets the entire screen space |
| 6516 | for displaying the new window from the window to split. Deleting and | 6517 | for displaying the new window from the window to split. Deleting and |
| 6517 | resizing a window preferably resizes one adjacent window only. | 6518 | resizing a window preferably resizes one adjacent window only. |
| 6518 | 6519 | ||
| 6519 | If this variable is non-nil, splitting a window tries to get the space | 6520 | If this variable is t, splitting a window tries to get the space |
| 6520 | proportionally from all windows in the same combination. This also | 6521 | proportionally from all windows in the same combination. This also |
| 6521 | allows to split a window that is otherwise too small or of fixed size. | 6522 | allows to split a window that is otherwise too small or of fixed size. |
| 6522 | Resizing and deleting a window proportionally resize all windows in the | 6523 | Resizing and deleting a window proportionally resize all windows in the |
| 6523 | same combination. | 6524 | same combination. |
| 6524 | 6525 | ||
| 6526 | Other values are reserved for future use. | ||
| 6527 | |||
| 6525 | This variable takes no effect if `window-combination-limit' is non-nil. */); | 6528 | This variable takes no effect if `window-combination-limit' is non-nil. */); |
| 6526 | Vwindow_combination_resize = Qnil; | 6529 | Vwindow_combination_resize = Qnil; |
| 6527 | 6530 | ||
| 6528 | DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit, | 6531 | DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit, |
| 6529 | doc: /* Non-nil means splitting a window makes a new parent window. | 6532 | doc: /* If t, splitting a window makes a new parent window. |
| 6530 | If this variable is nil, splitting a window will create a new parent | 6533 | If this variable is nil, splitting a window will create a new parent |
| 6531 | window only if the window has no parent window or the window shall | 6534 | window only if the window has no parent window or the window shall |
| 6532 | become a combination orthogonal to the one it is part of. | 6535 | become a combination orthogonal to the one it is part of. |