From 5fc3a9f5162ca6d8cd70586802e83e1a2c3cfdb0 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Wed, 23 Jul 2014 20:09:34 +0400 Subject: [PATCH] * frame.c (Fset_frame_height): Take frame top margin into account. Incorrect behavior was reported by Martin Rudalics in --- src/ChangeLog | 6 ++++++ src/frame.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index babfb66bacc..51d77283ffd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-07-23 Dmitry Antipov + + * frame.c (Fset_frame_height): Take frame top margin into account. + Incorrect behavior was reported by Martin Rudalics in + + 2014-07-22 Dmitry Antipov * xterm.h (struct x_output) [USE_X_TOOLKIT || USE_GTK]: Define diff --git a/src/frame.c b/src/frame.c index 731a62705bd..e68a3db24ea 100644 --- a/src/frame.c +++ b/src/frame.c @@ -2584,8 +2584,9 @@ FRAME should be HEIGHT pixels high. */) { 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); } -- 2.39.2