* frame.c (Fframe_pixel_height): Fix documentation.

Fixes: debbugs:12733

diff --git a/src/ChangeLog b/src/ChangeLog
index e3371796bfbe07e8d4e6d6ec25f3518053c1118b..1ae99a22cf9d01233af6f46797d3302a0a14fd32 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-30  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * frame.c (Fframe_pixel_height): Fix documentation (Bug#12733).
+
 2012-10-30  Kenichi Handa  <handa@gnu.org>
 
        * font.c (Ffont_at): If WINDOW is specified and it is not

diff --git a/src/frame.c b/src/frame.c
index 17a99000c9b46630e75d5cf70e8e0877a50bdc99..79893abf8265e73753785a8f837df7b34f935e89 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -2474,11 +2474,8 @@ In the Gtk+ version of Emacs, it includes only any window (including
 the minibuffer or echo 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.
+With other graphical versions, it also includes the tool bar and the
+menu bar.
 
 For a text terminal, it includes the menu bar.  In this case, the
 result is really in characters rather than pixels (i.e., is identical