From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 17 Jul 2010 18:34:44 +0000 (-0400)
Subject: * frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660).
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~31
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3b8eff32333e497a65c509ef31cfc925ee92c1ff;p=emacs.git

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

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  <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 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)