[Emacs-diffs] Changes to emacs/src/xmenu.c

[Jan Djärv]

Index: emacs/src/xmenu.c
diff -c emacs/src/xmenu.c:1.271 emacs/src/xmenu.c:1.272
*** emacs/src/xmenu.c:1.271     Sun Nov 14 10:59:31 2004
--- emacs/src/xmenu.c   Tue Nov 16 20:52:32 2004
***************
*** 1118,1131 ****
  
  #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
--- 1118,1123 ----
***************
*** 1133,1138 ****
--- 1125,1131 ----
       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.  */