diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-13 13:51:08 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-13 13:51:08 +0000 |
| commit | aaf34461ff5804e5cebe163b31e535da72e81d87 (patch) | |
| tree | b096310b459b78e437f08ac0f1f00954840a5db5 /lisp/help.el | |
| parent | 61d032dfd91b811d59acd7605ac02758be97e912 (diff) | |
| parent | 37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (diff) | |
| download | emacs-aaf34461ff5804e5cebe163b31e535da72e81d87.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
Diffstat (limited to 'lisp/help.el')
| -rw-r--r-- | lisp/help.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/help.el b/lisp/help.el index f75e26f93e6..4a94fd35bc7 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -958,14 +958,14 @@ This applies to `help', `apropos' and `completion' buffers, and some others." (remove-hook 'temp-buffer-show-hook 'resize-temp-buffer-window))) (defun resize-temp-buffer-window () - "Resize the current window to fit its contents. + "Resize the selected window to fit its contents. Will not make it higher than `temp-buffer-max-height' nor smaller than `window-min-height'. Do nothing if it is the only window on its frame, if it is not as wide as the frame or if some of the window's contents are scrolled out of view." (unless (or (one-window-p 'nomini) (not (pos-visible-in-window-p (point-min))) - (/= (frame-width) (window-width))) + (not (window-full-width-p))) (fit-window-to-buffer (selected-window) (if (functionp temp-buffer-max-height) |