From 3b8eff32333e497a65c509ef31cfc925ee92c1ff Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 17 Jul 2010 14:34:44 -0400 Subject: [PATCH] * frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660). --- src/ChangeLog | 4 ++++ src/frame.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index b2980ed64b5..c7de1948a2f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-07-17 Chong Yidong + + * frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660). + 2010-07-17 Jan Djärv * gtkutil.c (xg_event_is_for_menubar): Also check that event window diff --git a/src/frame.c b/src/frame.c index cebec92c426..69a640cdc96 100644 --- 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) -- 2.39.2