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.

diff --git a/src/frame.c b/src/frame.c
index 6debcb8e7bc68e9ef1fa1b20a80c79720718805d..b782b094c22f36ae7e89455c242e82feec4c7c92 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -634,7 +634,6 @@ make_frame (bool mini_p)
   f->garbaged = true;
   f->can_x_set_window_size = false;
   f->after_make_frame = false;
-  f->tool_bar_redisplayed_once = false;
   f->column_width = 1;  /* !FRAME_WINDOW_P value.  */
   f->line_height = 1;  /* !FRAME_WINDOW_P value.  */
 #ifdef HAVE_WINDOW_SYSTEM
@@ -3634,7 +3633,6 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 #endif
   /* Recalculate toolbar height.  */
   f->n_tool_bar_rows = 0;
-  f->tool_bar_redisplayed_once = false;
 
   /* Ensure we redraw it.  */
   clear_current_matrices (f);

diff --git a/src/frame.h b/src/frame.h
index 17e356d32cff942be1d771322f75e7ee8df33cb6..546bede213deca7b4e50a0a36cc8e22284b300cc 100644 (file)
--- a/src/frame.h
+++ b/src/frame.h
@@ -335,10 +335,6 @@ struct frame
   /* Set to true after this frame was made by `make-frame'.  */
   bool_bf after_make_frame : 1;
 
-  /* True means tool bar has been redisplayed at least once in current
-     session.  */
-  bool_bf tool_bar_redisplayed_once : 1;
-
   /* Bitfield area ends here.  */
 
   /* Number of lines (rounded up) of tool bar.  REMOVE THIS  */

diff --git a/src/w32fns.c b/src/w32fns.c
index d8e22e2aa9c8eb4cb54498c6ac0f649af0283c1f..48218e3bfd228d6d5ebc923e54d4b9cc9c176e75 100644 (file)
--- 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);

diff --git a/src/xdisp.c b/src/xdisp.c
index bb31697cc4f8e14a2bb9b4643c02939cd057e0ef..b86307776e2ec51bf6a0125cfc416e61f349bebe 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13735,18 +13735,6 @@ redisplay_internal (void)
            continue;
 
        retry_frame:
-
-#if defined (HAVE_WINDOW_SYSTEM) && !defined (USE_GTK) && !defined (HAVE_NS)
-         /* Redisplay internal tool bar if this is the first time so we
-            can adjust the frame height right now, if necessary.  */
-         if (!f->tool_bar_redisplayed_once)
-           {
-             if (redisplay_tool_bar (f))
-               adjust_frame_glyphs (f);
-             f->tool_bar_redisplayed_once = true;
-           }
-#endif
-
          if (FRAME_WINDOW_P (f) || FRAME_TERMCAP_P (f) || f == sf)
            {
              bool gcscrollbars

diff --git a/src/xfns.c b/src/xfns.c
index 0079e7b435776f0676e341d29b701082a1d5538d..42d32f6d9c24cfb9fae624e410363006e3eea7d9 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1189,10 +1189,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);