* frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660).

3b8eff32 · Chong Yidong · ce6e9d7f · 3b8eff32 · 3b8eff32
Commit 3b8eff32 authored Jul 17, 2010 by Chong Yidong
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

src/ChangeLog src/ChangeLog +4 -0

src/frame.c src/frame.c +3 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2010-07-17  Chong Yidong  <cyd@stupidchicken.com>
+
+	* frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660).
+
 2010-07-17  Jan Djärv  <jan.h.d@swipnet.se>

 	* gtkutil.c (xg_event_is_for_menubar): Also check that event window

--- a/src/frame.c
+++ b/src/frame.c
@@ -553,7 +553,9 @@ make_initial_frame (void)

  FRAME_CAN_HAVE_SCROLL_BARS (f) = 0;
  FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none;
-  FRAME_MENU_BAR_LINES(f) = NILP (Vmenu_bar_mode) ? 0 : 1;
+
+  /* The default value of menu-bar-mode is t.  */
+  set_menu_bar_lines (f, make_number (1), Qnil);

 #ifdef CANNOT_DUMP
  if (!noninteractive)