# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1279843043 -7200
# Node ID 6b1ebe1e590d6e1a4bbe88df8cd2d5623c535426
# Parent  5cddb2bed88773e7ff6f75a984b18e9b4af2e81d
* window.c (Fwindow_height): Doc fix (bug#6518).

diff -r 5cddb2bed887 -r 6b1ebe1e590d src/ChangeLog
--- a/src/ChangeLog	Wed Jul 21 20:05:31 2010 +0200
+++ b/src/ChangeLog	Fri Jul 23 01:57:23 2010 +0200
@@ -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 -r 5cddb2bed887 -r 6b1ebe1e590d src/window.c
--- a/src/window.c	Wed Jul 21 20:05:31 2010 +0200
+++ b/src/window.c	Fri Jul 23 01:57:23 2010 +0200
@@ -517,7 +517,10 @@
        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;
 {