From 5feb0b73eb5d589faf5c961eac86e8dbef67b3ba Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 11 Oct 2009 00:07:05 +0000 Subject: [PATCH] (Size and Position): Clarify what is included in the frame height. (Bug#4535) --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/frames.texi | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 6f9ef826f3f..bacb0bfb537 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2009-10-11 Glenn Morris + + * frames.texi (Size and Position): Clarify what is included in the frame + height. (Bug#4535) + 2009-10-10 Glenn Morris * windows.texi (Size of Window): The relationship between window and diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index c65a0a6c707..0ac25352bba 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -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, -@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +@c Free Software Foundation, Inc. @c See the file elisp.texi for copying conditions. @setfilename ../../info/frames @node Frames, Positions, Windows, Top @@ -980,12 +981,17 @@ selected frame. @defunx frame-pixel-width &optional frame These functions return the height and width of the main display area of @var{frame}, measured in pixels. If you don't supply @var{frame}, -they use the selected frame. +they use the selected frame. For a text-only terminal, the results are +in characters rather than pixels. -These values include the internal borders, and windows' scroll bars -and fringes (which belong to individual windows, not to the frame -itself), but do not include menu bars or tool bars (except when using -X without an X toolkit). +These values include the internal borders, and windows' scroll bars and +fringes (which belong to individual windows, not to the frame itself). +The exact value of the heights depends on the window-system and toolkit +in use. With Gtk+, the height does not include any tool bar or menu +bar. With the Motif or Lucid toolkits, it includes the tool bar but +not the menu bar. In a graphical version with no toolkit, it includes +both the tool bar and menu bar. For a text-only terminal, the result +includes the menu bar. @end defun @defun frame-char-height &optional frame