diff options
| author | Miles Bader | 2006-06-07 18:05:10 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-06-07 18:05:10 +0000 |
| commit | b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb (patch) | |
| tree | de3804210a8cd955e0d3b9abc15679480930bc82 /lisp/window.el | |
| parent | 885b7d0991bd4b4b8f4bd1d3cd21c18a697bbce2 (diff) | |
| parent | 26c9afc3239e18b03537faaea33e3e82e28099e6 (diff) | |
| download | emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.tar.gz emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 285-296)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: admin/FOR-RELEASE: Update refcard section.
* gnus--rel--5.10 (patch 102-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
Diffstat (limited to 'lisp/window.el')
| -rw-r--r-- | lisp/window.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/window.el b/lisp/window.el index 4d02390be16..ef9dd5d896d 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -597,7 +597,7 @@ in some window." | |||
| 597 | (1+ (vertical-motion (buffer-size) window)))))) | 597 | (1+ (vertical-motion (buffer-size) window)))))) |
| 598 | 598 | ||
| 599 | (defun fit-window-to-buffer (&optional window max-height min-height) | 599 | (defun fit-window-to-buffer (&optional window max-height min-height) |
| 600 | "Make WINDOW the right size to display its contents exactly. | 600 | "Make WINDOW the right height to display its contents exactly. |
| 601 | If WINDOW is omitted or nil, it defaults to the selected window. | 601 | If WINDOW is omitted or nil, it defaults to the selected window. |
| 602 | If the optional argument MAX-HEIGHT is supplied, it is the maximum height | 602 | If the optional argument MAX-HEIGHT is supplied, it is the maximum height |
| 603 | the window is allowed to be, defaulting to the frame height. | 603 | the window is allowed to be, defaulting to the frame height. |