From 1636e8c75a0d4576e6ac7a246bd7a484a79ecbc2 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Wed, 16 Sep 2015 12:01:06 +0200 Subject: Remove tool_bar_redisplayed_once and associated code. * src/frame.h (tool_bar_redisplayed_once): Remove slot. * src/frame.c (make_frame, x_set_font): Remove initialization of f->tool_bar_redisplayed_once. * src/w32fns.c (x_change_tool_bar_height): * src/xfns.c (x_change_tool_bar_height): Don't check for f->tool_bar_redisplayed_once. * src/xdisp.c (redisplay_internal): Remove handling of f->tool_bar_redisplayed_once. --- src/w32fns.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/w32fns.c') diff --git a/src/w32fns.c b/src/w32fns.c index d8e22e2aa9c..48218e3bfd2 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -1763,10 +1763,8 @@ x_change_tool_bar_height (struct frame *f, int height) f->n_tool_bar_rows = 0; adjust_frame_size (f, -1, -1, - ((!f->tool_bar_redisplayed_once - && (NILP (fullscreen = - get_frame_param (f, Qfullscreen)) - || EQ (fullscreen, Qfullwidth))) ? 1 + ((NILP (fullscreen = get_frame_param (f, Qfullscreen)) + || EQ (fullscreen, Qfullwidth)) ? 1 : (old_height == 0 || height == 0) ? 2 : 4), false, Qtool_bar_lines); -- cgit v1.2.1