diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-04-12 21:52:12 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-04-12 21:52:12 +0000 |
| commit | 18144c84231aee36ae1d11b74941c9b318f1706a (patch) | |
| tree | 6b9cf7e0337cd5966089e795c9278a1a86f9d5c1 /src/gui_gtk_x11.c | |
| parent | 4c3f536f472c7443ed4f672ae6d35a28805d7641 (diff) | |
| download | vim-18144c84231aee36ae1d11b74941c9b318f1706a.zip | |
updated for version 7.0d02
Diffstat (limited to 'src/gui_gtk_x11.c')
| -rw-r--r-- | src/gui_gtk_x11.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index adb603a6c..b44100e5b 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -3562,8 +3562,9 @@ gui_mch_init(void) else # endif /* FEAT_GUI_GNOME */ { - if (vim_strchr(p_go, GO_MENUS) != NULL) - gtk_widget_show(gui.menubar); + /* Always show the menubar, otherwise <F10> doesn't work. It may be + * disabled in gui_init() later. */ + gtk_widget_show(gui.menubar); gtk_box_pack_start(GTK_BOX(vbox), gui.menubar, FALSE, FALSE, 0); } #endif /* FEAT_MENU */ @@ -4366,7 +4367,8 @@ gui_mch_enable_menu(int showit) # endif widget = gui.menubar; - if (!showit != !GTK_WIDGET_VISIBLE(widget)) + /* Do not disable the menu while starting up, otherwise F10 doesn't work. */ + if (!showit != !GTK_WIDGET_VISIBLE(widget) && !gui.starting) { if (showit) gtk_widget_show(widget); |