aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/help.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4dd70c7eff8..39c2cd1fdcf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-08-06 Martin Rudalics <rudalics@gmx.at>
2
3 * help.el (resize-temp-buffer-window): Use window-full-width-p
4 instead of comparing frame-width and window-width.
5
12007-08-05 Peter Povinec <ppovinec <at> yahoo.com> (tiny change) 62007-08-05 Peter Povinec <ppovinec <at> yahoo.com> (tiny change)
2 7
3 * term.el: Honor term-default-fg-color and term-default-bg-color 8 * term.el: Honor term-default-fg-color and term-default-bg-color
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."
958 (remove-hook 'temp-buffer-show-hook 'resize-temp-buffer-window))) 958 (remove-hook 'temp-buffer-show-hook 'resize-temp-buffer-window)))
959 959
960(defun resize-temp-buffer-window () 960(defun resize-temp-buffer-window ()
961 "Resize the current window to fit its contents. 961 "Resize the selected window to fit its contents.
962Will not make it higher than `temp-buffer-max-height' nor smaller than 962Will not make it higher than `temp-buffer-max-height' nor smaller than
963`window-min-height'. Do nothing if it is the only window on its frame, if it 963`window-min-height'. Do nothing if it is the only window on its frame, if it
964is not as wide as the frame or if some of the window's contents are scrolled 964is not as wide as the frame or if some of the window's contents are scrolled
965out of view." 965out of view."
966 (unless (or (one-window-p 'nomini) 966 (unless (or (one-window-p 'nomini)
967 (not (pos-visible-in-window-p (point-min))) 967 (not (pos-visible-in-window-p (point-min)))
968 (/= (frame-width) (window-width))) 968 (not (window-full-width-p)))
969 (fit-window-to-buffer 969 (fit-window-to-buffer
970 (selected-window) 970 (selected-window)
971 (if (functionp temp-buffer-max-height) 971 (if (functionp temp-buffer-max-height)