aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/window.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c05cc4102e4..c1eb23bc64f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12008-12-21 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (set-window-text-height): Fix doc-string.
4
12008-12-21 Stefan Monnier <monnier@iro.umontreal.ca> 52008-12-21 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * minibuffer.el (completion-all-completions-with-base-size): Remove. 7 * minibuffer.el (completion-all-completions-with-base-size): Remove.
diff --git a/lisp/window.el b/lisp/window.el
index ed97c61f434..53ec4a665db 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1210,7 +1210,7 @@ The selected window remains selected. Return the new window."
1210 1210
1211 1211
1212(defun set-window-text-height (window height) 1212(defun set-window-text-height (window height)
1213 "Sets the height in lines of the text display area of WINDOW to HEIGHT. 1213 "Set the height in lines of the text display area of WINDOW to HEIGHT.
1214HEIGHT doesn't include the mode line or header line, if any, or 1214HEIGHT doesn't include the mode line or header line, if any, or
1215any partial-height lines in the text display area. 1215any partial-height lines in the text display area.
1216 1216