diff src/xmenu.c @ 58283:c163562b2d59

* xmenu.c (x_menu_in_use): Removed. (x_menu_set_in_use): Also set popup_activated_flag. * xfns.c (Fx_file_dialog): Call popup_activated instead of x_menu_in_use. Call x_menu_set_in_use in Motif version also. * xterm.h: (x_menu_in_use): Removed.

--- a/src/xmenu.c	Tue Nov 16 17:31:19 2004 +0000
+++ b/src/xmenu.c	Tue Nov 16 20:52:32 2004 +0000
@@ -1118,14 +1118,6 @@
 
 #ifndef MSDOS
 
-/* Return non-zero if a dialog or popup menu is already popped up.  */
-
-int
-x_menu_in_use ()
-{
-  return ! NILP (menu_items_inuse);
-}
-
 /* Set menu_items_inuse so no other popup menu or dialog is created.  */
 
 void
@@ -1133,6 +1125,7 @@
      int in_use;
 {
   menu_items_inuse = in_use ? Qt : Qnil;
+  popup_activated_flag = in_use;
 }
 
 /* Wait for an X event to arrive or for a timer to expire.  */