2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 25732ac9f5d..30a02475262 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-21  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * frame.c (Fframe_parameters): Always report frame height without
+        menu and tool bar lines.
+
 2014-07-21  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (applicationDidFinishLaunching:): Call
diff --git a/src/frame.c b/src/frame.c
index 8d6f3567334..731a62705bd 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2240,7 +2240,7 @@ If FRAME is omitted or nil, return information on the currently selected frame.
             ? (f->new_pixelwise
                ? (f->new_height / FRAME_LINE_HEIGHT (f))
                : f->new_height)
-            : FRAME_LINES (f));
+            : FRAME_LINES (f)) - FRAME_TOP_MARGIN (f);
   store_in_alist (&alist, Qheight, make_number (height));
   width = (f->new_width
            ? (f->new_pixelwise