From 5dc4b8ca3d925213465ae5440ff48fcd999ccc3a Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Mon, 28 Jul 2014 19:03:23 +0200 Subject: [PATCH] Fix some issues with setting the frame height. * frame.c (x_set_frame_parameters): Revert part of 2014-07-24 change that added the top margin height to the requested height and revert (undocumented) part of 2014-07-28 change that changed the logic of whether a size change occurred. --- src/ChangeLog | 7 +++++++ src/frame.c | 11 +++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0c79309609f..6f864d23332 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2014-07-28 Martin Rudalics + + * frame.c (x_set_frame_parameters): Revert part of 2014-07-24 + change that added the top margin height to the requested height + and revert (undocumented) part of 2014-07-28 change that changed + the logic of whether a size change occurred. + 2014-07-28 Eli Zaretskii * .gdbinit (xwindow): The members total_cols, total_lines, diff --git a/src/frame.c b/src/frame.c index cc0d77e54c8..a911e71e822 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3116,9 +3116,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist) else if (EQ (prop, Qheight) && RANGED_INTEGERP (0, val, INT_MAX)) { height_change = 1; - /* Add menu and tool bar lines to correctly resize F pixelwise. */ - height - = (XFASTINT (val) + FRAME_TOP_MARGIN (f)) * FRAME_LINE_HEIGHT (f); + height = XFASTINT (val) * FRAME_LINE_HEIGHT (f); } else if (EQ (prop, Qtop)) top = val; @@ -3200,9 +3198,10 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist) XSETFRAME (frame, f); - if (((width_change && width != FRAME_TEXT_WIDTH (f)) - || (height_change && height != FRAME_TEXT_HEIGHT (f))) - && (f->new_height || f->new_width)) + if ((width_change || height_change) + && (width != FRAME_TEXT_WIDTH (f) + || height != FRAME_TEXT_HEIGHT (f) + || f->new_height || f->new_width)) { /* If necessary provide default values for HEIGHT and WIDTH. Do that here since otherwise a size change implied by an -- 2.39.2