aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2006-05-30 02:35:56 +0000
committerRichard M. Stallman2006-05-30 02:35:56 +0000
commit90e357ae457e40c8a4c7534deab619ee317f3bf1 (patch)
tree1e31ebcdc99531daf4e8b566b2ac7136273f61a3
parent39be728a88a93ae2b0a8ded953aa074fa0cf556d (diff)
downloademacs-90e357ae457e40c8a4c7534deab619ee317f3bf1.tar.gz
emacs-90e357ae457e40c8a4c7534deab619ee317f3bf1.zip
(temp-buffer-max-height): Doc fix.
-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 @@
12006-05-29 Richard Stallman <rms@gnu.org> 12006-05-29 Richard Stallman <rms@gnu.org>
2 2
3 * help.el (temp-buffer-max-height): Doc fix.
4
3 * subr.el (with-current-buffer): Doc fix. 5 * subr.el (with-current-buffer): Doc fix.
4 6
52006-05-29 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 72006-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."
942 942
943(defcustom temp-buffer-max-height (lambda (buffer) (/ (- (frame-height) 2) 2)) 943(defcustom temp-buffer-max-height (lambda (buffer) (/ (- (frame-height) 2) 2))
944 "Maximum height of a window displaying a temporary buffer. 944 "Maximum height of a window displaying a temporary buffer.
945This is the maximum height (in text lines) which `resize-temp-buffer-window' 945This is effective only when Temp Buffer Resize mode is enabled.
946The value is the maximum height (in lines) which `resize-temp-buffer-window'
946will give to a window displaying a temporary buffer. 947will give to a window displaying a temporary buffer.
947It can also be a function which will be called with the object corresponding 948It can also be a function to be called to choose the height for such a buffer.
948to the buffer to be displayed as argument and should return an integer 949It gets one argumemt, the buffer, and should return a positive integer."
949positive number."
950 :type '(choice integer function) 950 :type '(choice integer function)
951 :group 'help 951 :group 'help
952 :version "20.4") 952 :version "20.4")