* src/frame.c (Fframe_parameters): Always report frame height without

menu and tool bar lines.
* etc/TODO: remove frame height remark.

etc/ChangeLog

@@ -1,3 +1,7 @@
+2014-07-21  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* TODO: remove frame height remark.
+
 2014-07-11  Michael Albinus  <michael.albinus@gmx.de>
 
 	* NEWS: Passwords in batch mode are hidden.

etc/TODO

@@ -144,11 +144,6 @@ for users to customize.
   http://lists.gnu.org/archive/html/emacs-pretest-bug/2005-12/msg00165.html,
   and the rest of that discussion.
 
-** Height returned by frame-parameter ... and height given to
-   make-frame does not mean the same thing.  The former includes menu and
-   tool bar lines, the latter don't.  frame-parameter should return height
-   without menu and tool bar lines.
-
 ** In Emacs Info, examples of using Customize should be clickable
    and they should create Custom buffers.
 

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

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