Mercurial > emacs
changeset 109455:56176400910f
* frame.c (make_initial_frame): Use set_menu_bar_lines (Bug#6660).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 17 Jul 2010 14:34:44 -0400 |
| parents | 514fed5c0ded |
| children | 406b2d52ff00 |
| files | src/ChangeLog src/frame.c |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)