diff options
| author | Martin Rudalics | 2014-03-05 14:50:48 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2014-03-05 14:50:48 +0100 |
| commit | e1a2cb1ce53d6c59e8c2d56bbdee8aac2e8151b1 (patch) | |
| tree | 3fd66c8e39dd35fd2d7cad9efe15130b1db7cd09 /src/window.c | |
| parent | 6bf67038d90f120d6039baa10ec30662339fe496 (diff) | |
| download | emacs-e1a2cb1ce53d6c59e8c2d56bbdee8aac2e8151b1.tar.gz emacs-e1a2cb1ce53d6c59e8c2d56bbdee8aac2e8151b1.zip | |
Various window code related fixes and documentation changes.
* dispnew.c (change_frame_size_1): Add new_lines instead of
new_height, the latter may be still zero if passed as such.
* window.c (Fwindow_pixel_height): Mention bottom divider in
doc-string.
* window.el (window-min-height, window-min-width): Rewrite
doc-strings.
(window-body-size): Add PIXELWISE argument to make it consistent
with its callees.
* display.texi (Window Dividers): New section.
* frames.texi (Layout Parameters): Add right-divider-width and
bottom-divider-width.
* windows.texi (Window Sizes): Redraw schematic and rewrite its
description. Rewrite descriptions of `window-total-height',
`window-total-width', `window-total-size', `window-body-height',
`window-body-width' and `window-size-fixed'. Add descriptions
for `window-pixel-height', `window-pixel-width',
`window-min-height' and `window-min-width'. Remove description
of `window-size-fixed-p' moving part of it to that of
`window-size-fixed'.
(Resizing Windows): Mention dividers when talking about minimum
sizes.
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/window.c b/src/window.c index 09280d206c3..b6cfacd9aad 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -699,9 +699,9 @@ DEFUN ("window-pixel-height", Fwindow_pixel_height, Swindow_pixel_height, 0, 1, | |||
| 699 | doc: /* Return the height of window WINDOW in pixels. | 699 | doc: /* Return the height of window WINDOW in pixels. |
| 700 | WINDOW must be a valid window and defaults to the selected one. | 700 | WINDOW must be a valid window and defaults to the selected one. |
| 701 | 701 | ||
| 702 | The return value includes the mode line and header line, if any. If | 702 | The return value includes the mode line and header line and the bottom |
| 703 | WINDOW is an internal window, its pixel height is the height of the | 703 | divider, if any. If WINDOW is an internal window, its pixel height is |
| 704 | screen areas spanned by its children. */) | 704 | the height of the screen areas spanned by its children. */) |
| 705 | (Lisp_Object window) | 705 | (Lisp_Object window) |
| 706 | { | 706 | { |
| 707 | return make_number (decode_valid_window (window)->pixel_height); | 707 | return make_number (decode_valid_window (window)->pixel_height); |