changeset 109341:6b1ebe1e590d

* window.c (Fwindow_height): Doc fix (bug#6518).
author Juanma Barranquero <lekktu@gmail.com>
date Fri, 23 Jul 2010 01:57:23 +0200
parents 5cddb2bed887
children 4980a77d04a6
files src/ChangeLog src/window.c
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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;
 {