2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f50f1771232..07db0ab32cc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-22  Christoph Scholtes  <cschol2112@gmail.com>
+
+        * window.c (Fwindow_height): Doc fix (bug#6518).
+
 2010-07-21  Juanma Barranquero  <lekktu@gmail.com>
 
         * buffer.c (syms_of_buffer) <fringe-indicator-alist>: Doc fix.
diff --git a/src/window.c b/src/window.c
index 64a97437939..f9a2d31b4fe 100644
--- a/src/window.c
+++ b/src/window.c
@@ -517,7 +517,10 @@ DEFUN ("window-height", Fwindow_height, Swindow_height, 0, 1, 0,
        doc: /* Return the number of lines in WINDOW.
 WINDOW defaults to the selected window.
 
-The return value includes WINDOW's mode line and header line, if any.  */)
+The return value includes WINDOW's mode line and header line, if any.
+
+Note: The function does not take into account the value of `line-spacing'
+when calculating the number of lines in WINDOW.  */)
      (window)
      Lisp_Object window;
 {