aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiles Bader2000-09-04 11:56:36 +0000
committerMiles Bader2000-09-04 11:56:36 +0000
commit357460d08cdb25b342e7136f3094a73180e2ed05 (patch)
tree2101fd8b2087570aaa56da410fd52967ccacee73 /src
parentda353f232d84f8fbce0a34d6087f5e8edb17d798 (diff)
downloademacs-357460d08cdb25b342e7136f3094a73180e2ed05.tar.gz
emacs-357460d08cdb25b342e7136f3094a73180e2ed05.zip
(xmenu_show):
Call x_set_menu_resources_from_menu_face before initially popping up the menu, so the menu doesn't flash when the face settings are significantly different from the defaults.
Diffstat (limited to 'src')
-rw-r--r--src/xmenu.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 9f5fd8b55aa..f8b1fc4c605 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -2197,12 +2197,14 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
2197 /* Free the widget_value objects we used to specify the contents. */ 2197 /* Free the widget_value objects we used to specify the contents. */
2198 free_menubar_widget_value_tree (first_wv); 2198 free_menubar_widget_value_tree (first_wv);
2199 2199
2200 /* Override any default settings with ones from the `menu' face. */
2201 x_set_menu_resources_from_menu_face (f, menu);
2202
2200 /* No selection has been chosen yet. */ 2203 /* No selection has been chosen yet. */
2201 menu_item_selection = 0; 2204 menu_item_selection = 0;
2202 2205
2203 /* Display the menu. */ 2206 /* Display the menu. */
2204 lw_popup_menu (menu, (XEvent *) &dummy); 2207 lw_popup_menu (menu, (XEvent *) &dummy);
2205 x_set_menu_resources_from_menu_face (f, menu);
2206 popup_activated_flag = 1; 2208 popup_activated_flag = 1;
2207 2209
2208 /* Process events that apply to the menu. */ 2210 /* Process events that apply to the menu. */