[Emacs-diffs] trunk r117561: * src/frame.c (Fframe_parameters): Always report frame height without

[Dmitry Antipov]

------------------------------------------------------------
revno: 117561
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2014-07-21 20:58:12 +0400
message:
  * src/frame.c (Fframe_parameters): Always report frame height without
  menu and tool bar lines.
  * etc/TODO: remove frame height remark.
modified:
  etc/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1485
  etc/TODO                       todo-20091113204419-o5vbwnq5f7feedwu-1501
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2014-07-12 17:53:29 +0000
+++ b/etc/ChangeLog     2014-07-21 16:58:12 +0000
@@ -1,3 +1,7 @@
+2014-07-21  Dmitry Antipov  <address@hidden>
+
+       * TODO: remove frame height remark.
+
 2014-07-11  Michael Albinus  <address@hidden>
 
        * NEWS: Passwords in batch mode are hidden.

=== modified file 'etc/TODO'
--- a/etc/TODO  2014-07-16 17:06:12 +0000
+++ b/etc/TODO  2014-07-21 16:58:12 +0000
@@ -144,11 +144,6 @@
   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.
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-21 06:03:08 +0000
+++ b/src/ChangeLog     2014-07-21 16:58:12 +0000
@@ -1,3 +1,8 @@
+2014-07-21  Dmitry Antipov  <address@hidden>
+
+       * frame.c (Fframe_parameters): Always report frame height without
+       menu and tool bar lines.
+
 2014-07-21  Jan Djärv  <address@hidden>
 
        * nsterm.m (applicationDidFinishLaunching:): Call

=== modified file 'src/frame.c'
--- a/src/frame.c       2014-07-18 06:02:19 +0000
+++ b/src/frame.c       2014-07-21 16:58:12 +0000
@@ -2240,7 +2240,7 @@
            ? (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