summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-01-28 17:50:40 -0800
committerGlenn Morris <rgm@gnu.org>2012-01-28 17:50:40 -0800
commit5c28966be94d285449d365d3abdf3fb3aab3f3e1 (patch)
treeeb8dd991ca534d9d1577fa5c18f6f5a54b5b46bf
parentcac6bc2a69a75cca2dc00d984e74c769dd1f4211 (diff)
downloademacs-5c28966be94d285449d365d3abdf3fb3aab3f3e1.tar.gz
* doc/lispref/windows.texi (Window Sizes): Fix typo.
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/windows.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 563dd9b6c9d..bc145570ed7 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-29 Glenn Morris <rgm@gnu.org>
+
+ * windows.texi (Window Sizes): Fix typo.
+
2012-01-28 Chong Yidong <cyd@gnu.org>
* display.texi (Fringe Indicators): Clarify fringe-indicator-alist
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index a0f8b61ddfe..98263f4093c 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -479,7 +479,7 @@ partially-visible line at the bottom of the text area is not counted.
@end defun
For compatibility with previous versions of Emacs,
-@code{window-height} is an alias for @code{window-body-height}, and
+@code{window-height} is an alias for @code{window-total-height}, and
@code{window-width} is an alias for @code{window-body-width}. These
aliases are considered obsolete and will be removed in the future.