summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/help.el8
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9e1eb780f2d..0cb2920ddea 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
2006-05-29 Richard Stallman <rms@gnu.org>
+ * help.el (temp-buffer-max-height): Doc fix.
+
* subr.el (with-current-buffer): Doc fix.
2006-05-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
diff --git a/lisp/help.el b/lisp/help.el
index 1661779ca74..5efd58dfaf5 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -942,11 +942,11 @@ is currently activated with completion."
(defcustom temp-buffer-max-height (lambda (buffer) (/ (- (frame-height) 2) 2))
"Maximum height of a window displaying a temporary buffer.
-This is the maximum height (in text lines) which `resize-temp-buffer-window'
+This is effective only when Temp Buffer Resize mode is enabled.
+The value is the maximum height (in lines) which `resize-temp-buffer-window'
will give to a window displaying a temporary buffer.
-It can also be a function which will be called with the object corresponding
-to the buffer to be displayed as argument and should return an integer
-positive number."
+It can also be a function to be called to choose the height for such a buffer.
+It gets one argumemt, the buffer, and should return a positive integer."
:type '(choice integer function)
:group 'help
:version "20.4")