[Emacs-diffs] emacs/src ChangeLog frame.c

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/10/11 00:01:14

Modified files:
        src            : ChangeLog frame.c 

Log message:
        (Fframe_pixel_height): Doc fix.  (Bug#4535)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7785&r2=1.7786
http://cvs.savannah.gnu.org/viewcvs/emacs/src/frame.c?cvsroot=emacs&r1=1.429&r2=1.430

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7785
retrieving revision 1.7786
diff -u -b -r1.7785 -r1.7786
--- ChangeLog   8 Oct 2009 15:18:15 -0000       1.7785
+++ ChangeLog   11 Oct 2009 00:01:11 -0000      1.7786
@@ -1,3 +1,7 @@
+2009-10-11  Glenn Morris  <address@hidden>
+
+       * frame.c (Fframe_pixel_height): Doc fix.  (Bug#4535)
+
 2009-10-08  Jan Djärv  <address@hidden>
 
        * gtkutil.c (create_menus): Call gtk_widget_set_size_request for

Index: frame.c
===================================================================
RCS file: /sources/emacs/emacs/src/frame.c,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -b -r1.429 -r1.430
--- frame.c     24 Sep 2009 16:59:16 -0000      1.429
+++ frame.c     11 Oct 2009 00:01:14 -0000      1.430
@@ -2643,10 +2643,22 @@
 DEFUN ("frame-pixel-height", Fframe_pixel_height,
        Sframe_pixel_height, 0, 1, 0,
        doc: /* Return a FRAME's height in pixels.
-This counts only the height available for text lines,
-not menu bars on window-system Emacs frames.
-For a terminal frame, the result really gives the height in characters.
-If FRAME is omitted, the selected frame is used.  */)
+If FRAME is omitted, the selected frame is used.  The exact value
+of the result depends on the window-system and toolkit in use:
+
+In the Gtk+ version of Emacs, it includes only any window (including
+the minibuffer or eacho area), mode line, and header line.  It does not
+include the tool bar or menu bar.
+
+With the Motif or Lucid toolkits, it also 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, it includes the menu bar.  In this case, the
+result is really in characters rather than pixels (i.e., is identical
+to `frame-height'). */)
      (frame)
      Lisp_Object frame;
 {