# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1279391684 14400
# Node ID 56176400910f979e39fc8c4d0c13b298c2475e33
# Parent  514fed5c0dedfcbca2f137658b7679957f506176
* frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660).

diff -r 514fed5c0ded -r 56176400910f src/ChangeLog
--- a/src/ChangeLog	Sat Jul 17 18:03:16 2010 +0200
+++ b/src/ChangeLog	Sat Jul 17 14:34:44 2010 -0400
@@ -1,3 +1,7 @@
+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
diff -r 514fed5c0ded -r 56176400910f src/frame.c
--- a/src/frame.c	Sat Jul 17 18:03:16 2010 +0200
+++ b/src/frame.c	Sat Jul 17 14:34:44 2010 -0400
@@ -553,7 +553,9 @@
 
   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)