diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2015-09-16 12:01:06 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2015-09-16 12:01:06 +0200 |
| commit | 1636e8c75a0d4576e6ac7a246bd7a484a79ecbc2 (patch) | |
| tree | 12fd50c942f332fcda62349fc282a8401c0a47da /src/w32fns.c | |
| parent | 31ff037ab849a8d5d9b871a8927154ffb38a8694 (diff) | |
| download | emacs-1636e8c75a0d4576e6ac7a246bd7a484a79ecbc2.tar.gz | |
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.
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 6 |
1 files changed, 2 insertions, 4 deletions
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); |