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

1 files changed, 1 insertions, 8 deletions

diff --git a/src/xmenu.c b/src/xmenu.c
index 23904576edf..6f990bd11b1 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1118,14 +1118,6 @@ on the left of the dialog box and all following items on the right.
 
 #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 @@ x_menu_set_in_use (in_use)
      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.  */