[Emacs-diffs] /srv/bzr/emacs/trunk r100840: * frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660).

[Chong Yidong]

------------------------------------------------------------
revno: 100840
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-07-17 14:34:44 -0400
message:
  * frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660).
modified:
  src/ChangeLog
  src/frame.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-17 16:03:16 +0000
+++ b/src/ChangeLog     2010-07-17 18:34:44 +0000
@@ -1,3 +1,7 @@
+2010-07-17  Chong Yidong  <address@hidden>
+
+       * frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660).
+
 2010-07-17  Jan Djärv  <address@hidden>
 
        * gtkutil.c (xg_event_is_for_menubar): Also check that event window

=== modified file 'src/frame.c'
--- a/src/frame.c       2010-07-10 19:01:01 +0000
+++ b/src/frame.c       2010-07-17 18:34:44 +0000
@@ -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)