[Emacs-diffs] trunk r117566: * frame.c (Fset_frame_height): Take frame top margin into account.

[Dmitry Antipov]

------------------------------------------------------------
revno: 117566
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2014-07-23 20:09:34 +0400
message:
  * frame.c (Fset_frame_height): Take frame top margin into account.
  Incorrect behavior was reported by Martin Rudalics <address@hidden> in
  <http://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00258.html>
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-22 13:55:04 +0000
+++ b/src/ChangeLog     2014-07-23 16:09:34 +0000
@@ -1,3 +1,9 @@
+2014-07-23  Dmitry Antipov  <address@hidden>
+
+       * frame.c (Fset_frame_height): Take frame top margin into account.
+       Incorrect behavior was reported by Martin Rudalics <address@hidden> in
+       <http://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00258.html>
+
 2014-07-22  Dmitry Antipov  <address@hidden>
 
        * xterm.h (struct x_output) [USE_X_TOOLKIT || USE_GTK]: Define

=== modified file 'src/frame.c'
--- a/src/frame.c       2014-07-21 16:58:12 +0000
+++ b/src/frame.c       2014-07-23 16:09:34 +0000
@@ -2584,8 +2584,9 @@
     {
       if (NILP (pixelwise))
        {
-         if (XINT (height) != FRAME_LINES (f))
-           x_set_window_size (f, 1, FRAME_COLS (f), XINT (height), 0);
+         if (FRAME_LINES (f) - FRAME_TOP_MARGIN (f) != XINT (height))
+           x_set_window_size (f, 1, FRAME_COLS (f),
+                              XINT (height) + FRAME_TOP_MARGIN (f), 0);
 
          do_pending_window_change (0);
        }