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

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

2 files changed, 4 insertions, 5 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 8ae48c277a8..fdaf1f0cabd 100644
--- a/etc/ChangeLog
+++ b/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.
diff --git a/etc/TODO b/etc/TODO
index cbf8336230e..11bbd356a88 100644
--- a/etc/TODO
+++ b/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.