diff options
| author | Eli Zaretskii | 2001-02-23 21:35:45 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2001-02-23 21:35:45 +0000 |
| commit | 119171dd3df9afdcad649430b4073701abb18532 (patch) | |
| tree | 41fbfe3813d5154d23e5d70d21a295910de0e5a2 | |
| parent | dcd5ecef41f1d1c9474deea7fe6b5f206d4d3742 (diff) | |
| download | emacs-119171dd3df9afdcad649430b4073701abb18532.tar.gz emacs-119171dd3df9afdcad649430b4073701abb18532.zip | |
(fit-window-to-buffer, window-safely-shrinkable-p)
(shrink-window-if-larger-than-buffer): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/window.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c583ccdeac3..80fef759d13 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2001-02-23 Eli Zaretskii <eliz@is.elta.co.il> | ||
| 2 | |||
| 3 | * window.el (fit-window-to-buffer, window-safely-shrinkable-p) | ||
| 4 | (shrink-window-if-larger-than-buffer): Doc fix. | ||
| 5 | |||
| 1 | 2001-02-23 Stefan Monnier <monnier@cs.yale.edu> | 6 | 2001-02-23 Stefan Monnier <monnier@cs.yale.edu> |
| 2 | 7 | ||
| 3 | * hi-lock.el (hi-lock-unface-buffer): Use nil rather than t for | 8 | * hi-lock.el (hi-lock-unface-buffer): Use nil rather than t for |
diff --git a/lisp/window.el b/lisp/window.el index daa51771866..e6a99180930 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -143,7 +143,8 @@ even if it is inactive." | |||
| 143 | count)) | 143 | count)) |
| 144 | 144 | ||
| 145 | (defun window-safely-shrinkable-p (&optional window) | 145 | (defun window-safely-shrinkable-p (&optional window) |
| 146 | "Non-nil if the WINDOW can be shrunk without shrinking other windows." | 146 | "Non-nil if the WINDOW can be shrunk without shrinking other windows. |
| 147 | If WINDOW is nil or omitted, it defaults to the currently selected window." | ||
| 147 | (save-selected-window | 148 | (save-selected-window |
| 148 | (when window (select-window window)) | 149 | (when window (select-window window)) |
| 149 | (or (and (not (eq window (frame-first-window))) | 150 | (or (and (not (eq window (frame-first-window))) |
| @@ -367,6 +368,7 @@ in some window." | |||
| 367 | 368 | ||
| 368 | (defun fit-window-to-buffer (&optional window max-height min-height) | 369 | (defun fit-window-to-buffer (&optional window max-height min-height) |
| 369 | "Make WINDOW the right size to display its contents exactly. | 370 | "Make WINDOW the right size to display its contents exactly. |
| 371 | If WINDOW is omitted or nil, it defaults to the selected window. | ||
| 370 | If the optional argument MAX-HEIGHT is supplied, it is the maximum height | 372 | If the optional argument MAX-HEIGHT is supplied, it is the maximum height |
| 371 | the window is allowed to be, defaulting to the frame height. | 373 | the window is allowed to be, defaulting to the frame height. |
| 372 | If the optional argument MIN-HEIGHT is supplied, it is the minimum | 374 | If the optional argument MIN-HEIGHT is supplied, it is the minimum |
| @@ -452,6 +454,7 @@ header-line." | |||
| 452 | 454 | ||
| 453 | (defun shrink-window-if-larger-than-buffer (&optional window) | 455 | (defun shrink-window-if-larger-than-buffer (&optional window) |
| 454 | "Shrink the WINDOW to be as small as possible to display its contents. | 456 | "Shrink the WINDOW to be as small as possible to display its contents. |
| 457 | If WINDOW is omitted or nil, it defaults to the selected window. | ||
| 455 | Do not shrink to less than `window-min-height' lines. | 458 | Do not shrink to less than `window-min-height' lines. |
| 456 | Do nothing if the buffer contains more lines than the present window height, | 459 | Do nothing if the buffer contains more lines than the present window height, |
| 457 | or if some of the window's contents are scrolled out of view, | 460 | or if some of the window's contents are scrolled out of view, |