From 02615da0724b1c97628f0073455e975710ca1cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 30 Oct 2012 19:28:48 +0100 Subject: [PATCH] * frame.c (Fframe_pixel_height): Fix documentation. Fixes: debbugs:12733 --- src/ChangeLog | 4 ++++ src/frame.c | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index e3371796bfb..1ae99a22cf9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-10-30 Jan Djärv + + * frame.c (Fframe_pixel_height): Fix documentation (Bug#12733). + 2012-10-30 Kenichi Handa * font.c (Ffont_at): If WINDOW is specified and it is not diff --git a/src/frame.c b/src/frame.c index 17a99000c9b..79893abf826 100644 --- 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