Mercurial > emacs

changeset 31365:048a65296215

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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.
author Miles Bader <miles@gnu.org>
date Mon, 04 Sep 2000 11:56:36 +0000
parents 8bafcf2cfd57
children fb34fa0a3cce
files src/xmenu.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/xmenu.c	Mon Sep 04 11:55:02 2000 +0000
+++ b/src/xmenu.c	Mon Sep 04 11:56:36 2000 +0000
@@ -2197,12 +2197,14 @@
   /* 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.  */