diff src/window.c @ 109553:a4b9fa0b861b

Merge from emacs-23

--- a/src/window.c	Mon Jul 26 15:05:47 2010 -0400
+++ b/src/window.c	Tue Jul 27 04:10:05 2010 +0200
@@ -508,7 +508,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.  */)
   (Lisp_Object window)
 {
   return decode_any_window (window)->total_lines;