[Emacs-diffs] emacs/doc/lispref ChangeLog windows.texi

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/10/10 23:43:04

Modified files:
        doc/lispref    : ChangeLog windows.texi 

Log message:
        (Size of Window): The relationship between window and frame heights is
        not so simple.  (Bug#4535)
        Mention window-full-height-p.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispref/ChangeLog?cvsroot=emacs&r1=1.339&r2=1.340
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispref/windows.texi?cvsroot=emacs&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/lispref/ChangeLog,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -b -r1.339 -r1.340
--- ChangeLog   7 Oct 2009 14:32:08 -0000       1.339
+++ ChangeLog   10 Oct 2009 23:43:03 -0000      1.340
@@ -1,3 +1,9 @@
+2009-10-10  Glenn Morris  <address@hidden>
+
+       * windows.texi (Size of Window): The relationship between window and
+       frame heights is not so simple.  (Bug#4535)
+       Mention window-full-height-p.
+
 2009-10-07  Stefan Monnier  <address@hidden>
 
        * positions.texi (Text Lines): Remove goto-line, since it shouldn't be

Index: windows.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/lispref/windows.texi,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- windows.texi        27 Aug 2009 04:24:02 -0000      1.36
+++ windows.texi        10 Oct 2009 23:43:04 -0000      1.37
@@ -1,7 +1,8 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
address@hidden   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software 
Foundation, Inc.
address@hidden   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
address@hidden   Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../../info/windows
 @node Windows, Frames, Buffers, Top
@@ -1945,11 +1946,14 @@
   The following three functions return size information about a window:
 
 @defun window-height &optional window
-This function returns the number of lines in @var{window}, including its
-mode line and header line, if any.  If @var{window} fills its entire
-frame except for the echo area, this is typically one less than the
-value of @code{frame-height} on that frame.  The default for
address@hidden is the selected window.
+This function returns the number of lines in @var{window} (by default
+the selected window), including any mode line and header line.
+The result is almost always less than the value of @code{frame-height}
+for the associated frame, because the latter also includes any echo
+area.  Depending on the toolkit in use, the frame height can also
+include the menu bar and tool bar (@pxref{Size and Position}).
+Therefore in general it is not straightforward to compare window and
+frame heights (see @code{window-full-height-p} below).
 
 @example
 @group
@@ -1972,6 +1976,12 @@
 mode line (if any) or the header line (if any).
 @end defun
 
address@hidden window-full-height-p &optional window
+This function returns address@hidden if @var{window} is as tall as the
+frame that contains it.  The default for @var{window} is the selected
+window.
address@hidden defun
+
 @defun window-width &optional window
 This function returns the number of columns in @var{window}.  The
 default for @var{window} is the selected window.