diff options
| author | Miles Bader | 2000-10-20 15:19:04 +0000 |
|---|---|---|
| committer | Miles Bader | 2000-10-20 15:19:04 +0000 |
| commit | b86c791c0fce7721bee869de8d7158a824c74dc7 (patch) | |
| tree | 15e0323c811a4c8d2c098bd59ba48462a64f225d | |
| parent | 361691dc0d63b082e3eb2590206ac3fa93ed0486 (diff) | |
| download | emacs-b86c791c0fce7721bee869de8d7158a824c74dc7.tar.gz emacs-b86c791c0fce7721bee869de8d7158a824c74dc7.zip | |
(resize-temp-buffer-window): Use `set-window-text-height'
instead of `enlarge-window' & `mode-line-window-height-fudge'.
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/help.el | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4fab07a0c1e..953077af4ac 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2000-10-21 Miles Bader <miles@gnu.org> | ||
| 2 | |||
| 3 | * window.el (window-text-height, set-window-text-height): | ||
| 4 | New functions. | ||
| 5 | (shrink-window-if-larger-than-buffer): Use `window-text-height' | ||
| 6 | instead of `window-height' & `mode-line-window-height-fudge'. | ||
| 7 | (mode-line-window-height-fudge): Add FACE parameter. | ||
| 8 | * help.el (resize-temp-buffer-window): Use `set-window-text-height' | ||
| 9 | instead of `enlarge-window' & `mode-line-window-height-fudge'. | ||
| 10 | |||
| 1 | 2000-10-20 Miles Bader <miles@gnu.org> | 11 | 2000-10-20 Miles Bader <miles@gnu.org> |
| 2 | 12 | ||
| 3 | * window.el (height-affecting-face-attributes): Use `defconst'. | 13 | * window.el (height-affecting-face-attributes): Use `defconst'. |
diff --git a/lisp/help.el b/lisp/help.el index a607d81511b..adbe12e6ae9 100644 --- a/lisp/help.el +++ b/lisp/help.el | |||
| @@ -1466,13 +1466,10 @@ out of view." | |||
| 1466 | (let* ((max-height (if (functionp temp-buffer-max-height) | 1466 | (let* ((max-height (if (functionp temp-buffer-max-height) |
| 1467 | (funcall temp-buffer-max-height (current-buffer)) | 1467 | (funcall temp-buffer-max-height (current-buffer)) |
| 1468 | temp-buffer-max-height)) | 1468 | temp-buffer-max-height)) |
| 1469 | (win-height (- (window-height) | ||
| 1470 | (mode-line-window-height-fudge) | ||
| 1471 | 1)) | ||
| 1472 | (min-height (1- window-min-height)) | 1469 | (min-height (1- window-min-height)) |
| 1473 | (text-height (count-screen-lines)) | 1470 | (text-height (count-screen-lines)) |
| 1474 | (new-height (max (min text-height max-height) min-height))) | 1471 | (new-height (max (min text-height max-height) min-height))) |
| 1475 | (enlarge-window (- new-height win-height))))) | 1472 | (set-window-text-height nil new-height)))) |
| 1476 | 1473 | ||
| 1477 | ;; `help-manyarg-func-alist' is defined primitively (in doc.c). | 1474 | ;; `help-manyarg-func-alist' is defined primitively (in doc.c). |
| 1478 | ;; New primitives with `MANY' or `UNEVALLED' arglists should be added | 1475 | ;; New primitives with `MANY' or `UNEVALLED' arglists should be added |