diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 86ae8e73365..abbe882649a 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -12429,7 +12429,6 @@ prepare_menu_bars (void) | |||
| 12429 | continue; | 12429 | continue; |
| 12430 | 12430 | ||
| 12431 | if (!FRAME_TOOLTIP_P (f) | 12431 | if (!FRAME_TOOLTIP_P (f) |
| 12432 | && !FRAME_PARENT_FRAME (f) | ||
| 12433 | && (FRAME_ICONIFIED_P (f) | 12432 | && (FRAME_ICONIFIED_P (f) |
| 12434 | || FRAME_VISIBLE_P (f) == 1 | 12433 | || FRAME_VISIBLE_P (f) == 1 |
| 12435 | /* Exclude TTY frames that are obscured because they | 12434 | /* Exclude TTY frames that are obscured because they |
| @@ -12475,10 +12474,9 @@ prepare_menu_bars (void) | |||
| 12475 | && !XBUFFER (w->contents)->text->redisplay) | 12474 | && !XBUFFER (w->contents)->text->redisplay) |
| 12476 | continue; | 12475 | continue; |
| 12477 | 12476 | ||
| 12478 | if (FRAME_PARENT_FRAME (f)) | 12477 | if (!FRAME_PARENT_FRAME (f)) |
| 12479 | continue; | 12478 | menu_bar_hooks_run = update_menu_bar (f, false, menu_bar_hooks_run); |
| 12480 | 12479 | ||
| 12481 | menu_bar_hooks_run = update_menu_bar (f, false, menu_bar_hooks_run); | ||
| 12482 | update_tab_bar (f, false); | 12480 | update_tab_bar (f, false); |
| 12483 | #ifdef HAVE_WINDOW_SYSTEM | 12481 | #ifdef HAVE_WINDOW_SYSTEM |
| 12484 | update_tool_bar (f, false); | 12482 | update_tool_bar (f, false); |
| @@ -12490,7 +12488,10 @@ prepare_menu_bars (void) | |||
| 12490 | else | 12488 | else |
| 12491 | { | 12489 | { |
| 12492 | struct frame *sf = SELECTED_FRAME (); | 12490 | struct frame *sf = SELECTED_FRAME (); |
| 12493 | update_menu_bar (sf, true, false); | 12491 | |
| 12492 | if (!FRAME_PARENT_FRAME (sf)) | ||
| 12493 | update_menu_bar (sf, true, false); | ||
| 12494 | |||
| 12494 | update_tab_bar (sf, true); | 12495 | update_tab_bar (sf, true); |
| 12495 | #ifdef HAVE_WINDOW_SYSTEM | 12496 | #ifdef HAVE_WINDOW_SYSTEM |
| 12496 | update_tool_bar (sf, true); | 12497 | update_tool_bar (sf, true); |