aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1995-05-27 00:46:13 +0000
committerKarl Heuer1995-05-27 00:46:13 +0000
commit422fbe5f33bc69d49efdabad3b1a992bc709add5 (patch)
treeb7486601fb8861db3abe8c61d165e14ecf96c225 /src
parenta8e96cea90cc002eeb8933cca52c9518399328a9 (diff)
downloademacs-422fbe5f33bc69d49efdabad3b1a992bc709add5.tar.gz
emacs-422fbe5f33bc69d49efdabad3b1a992bc709add5.zip
(x_window): Call initialize_frame_menubar
near the end, after UNBLOCK_INPUT.
Diffstat (limited to 'src')
-rw-r--r--src/xfns.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xfns.c b/src/xfns.c
index a9f62fe2501..5b125682cc8 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2389,9 +2389,6 @@ x_window (f, window_prompting, minibuffer_only)
2389 2389
2390 f->display.x->column_widget = pane_widget; 2390 f->display.x->column_widget = pane_widget;
2391 2391
2392 if (!minibuffer_only && FRAME_EXTERNAL_MENU_BAR (f))
2393 initialize_frame_menubar (f);
2394
2395 /* mappedWhenManaged to false tells to the paned window to not map/unmap 2392 /* mappedWhenManaged to false tells to the paned window to not map/unmap
2396 the emacs screen when changing menubar. This reduces flickering. */ 2393 the emacs screen when changing menubar. This reduces flickering. */
2397 2394
@@ -2523,6 +2520,9 @@ x_window (f, window_prompting, minibuffer_only)
2523 2520
2524 UNBLOCK_INPUT; 2521 UNBLOCK_INPUT;
2525 2522
2523 if (!minibuffer_only && FRAME_EXTERNAL_MENU_BAR (f))
2524 initialize_frame_menubar (f);
2525
2526 if (FRAME_X_WINDOW (f) == 0) 2526 if (FRAME_X_WINDOW (f) == 0)
2527 error ("Unable to create window"); 2527 error ("Unable to create window");
2528} 2528}