From 9be95071f4d78ea1f285aff884f55cf1424aaa6a Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Fri, 7 Feb 2014 11:55:28 +0100 Subject: [PATCH] In window_resize_apply adjust margin width, if necessary (Bug#16649). * window.c (window_resize_apply): Adjust margin width, if necessary. --- src/ChangeLog | 3 ++- src/window.c | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 99d545cf99b..a056eead1f6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,11 +1,12 @@ 2014-02-07 Martin Rudalics - Constrain window box and body sizes (Bug#16649). + Constrain window box/body sizes and margin widths (Bug#16649). * xdisp.c (window_box_width): Don't return less than zero. (window_box_left_offset, window_box_right_offset): Don't return more than the window's pixel width. * window.c (window_body_height, window_body_width): Don't return negative value. + (window_resize_apply): Adjust margin width, if necessary. 2014-02-07 Glenn Morris diff --git a/src/window.c b/src/window.c index adde3919699..b2c97d52157 100644 --- a/src/window.c +++ b/src/window.c @@ -3923,8 +3923,11 @@ window_resize_apply (struct window *w, bool horflag) } } else - /* Bug#15957. */ - w->window_end_valid = 0; + { + adjust_window_margins (w); + /* Bug#15957. */ + w->window_end_valid = 0; + } } -- 2.39.2