* window.c (Fwindow_height): Doc fix (bug#6518).

a77cfeaf · Christoph Scholtes · Juanma Barranquero · 1c84bc7a · a77cfeaf · a77cfeaf
Commit a77cfeaf authored Jul 23, 2010 by Christoph Scholtes Committed by Juanma Barranquero Jul 23, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

src/ChangeLog src/ChangeLog +4 -0

src/window.c src/window.c +4 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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
+++ 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;
 {