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

diff --git a/src/ChangeLog b/src/ChangeLog
index b2980ed64b531a44e2eed9d3ae13cd743d84c1e5..c7de1948a2fcbc2efd80a7e9ce9cd023165a0a54 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/frame.c b/src/frame.c
index cebec92c42669838493212d03e0e6da518b8ea71..69a640cdc96c1b71786ba5faeaf9cfecf43bcad8 100644 (file)
--- 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)