From: Miles Bader <miles@gnu.org>
Date: Mon, 4 Sep 2000 11:56:36 +0000 (+0000)
Subject: (xmenu_show):
X-Git-Tag: emacs-pretest-21.0.90~1813
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=357460d08cdb25b342e7136f3094a73180e2ed05;p=emacs.git

(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.
---

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)
   /* Free the widget_value objects we used to specify the contents.  */
   free_menubar_widget_value_tree (first_wv);
 
+  /* Override any default settings with ones from the `menu' face.  */
+  x_set_menu_resources_from_menu_face (f, menu);
+
   /* No selection has been chosen yet.  */
   menu_item_selection = 0;
 
   /* Display the menu.  */
   lw_popup_menu (menu, (XEvent *) &dummy);
-  x_set_menu_resources_from_menu_face (f, menu);
   popup_activated_flag = 1;
 
   /* Process events that apply to the menu.  */