* src/macmenu.c (Vmenu_updating_frame, syms_of_xmenu):

* src/w32menu.c (Vmenu_updating_frame, syms_of_xmenu): Apply
2006-09-08 change for xmenu.c.

diff --git a/src/macmenu.c b/src/macmenu.c
index e7d69d5657c017381ba1702181d79fe249c1bb43..72ab9f9066712f41cdf6156503353c1f7fab7b25 100644 (file)
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -158,10 +158,10 @@ typedef struct _widget_value
 #define FALSE 0
 #endif /* no TRUE */
 
-Lisp_Object Vmenu_updating_frame;
-
 Lisp_Object Qdebug_on_next_call;
 
+extern Lisp_Object Vmenu_updating_frame;
+
 extern Lisp_Object Qmenu_bar, Qmac_apple_event;
 
 extern Lisp_Object QCtoggle, QCradio;
@@ -2630,11 +2630,6 @@ syms_of_macmenu ()
   Qdebug_on_next_call = intern ("debug-on-next-call");
   staticpro (&Qdebug_on_next_call);
 
-  DEFVAR_LISP ("menu-updating-frame", &Vmenu_updating_frame,
-              doc: /* Frame for which we are updating a menu.
-The enable predicate for a menu command should check this variable.  */);
-  Vmenu_updating_frame = Qnil;
-
   defsubr (&Sx_popup_menu);
 #ifdef HAVE_MENUS
   defsubr (&Sx_popup_dialog);

diff --git a/src/w32menu.c b/src/w32menu.c
index 11af1d66b6fc4ba9a4836350eacbd4676196daec..3a4dc20fc151452776d672c8392f6d92878ebcf6 100644 (file)
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -149,10 +149,10 @@ GetMenuItemInfoA_Proc get_menu_item_info = NULL;
 SetMenuItemInfoA_Proc set_menu_item_info = NULL;
 AppendMenuW_Proc unicode_append_menu = NULL;
 
-Lisp_Object Vmenu_updating_frame;
-
 Lisp_Object Qdebug_on_next_call;
 
+extern Lisp_Object Vmenu_updating_frame;
+
 extern Lisp_Object Qmenu_bar;
 
 extern Lisp_Object QCtoggle, QCradio;
@@ -2548,11 +2548,6 @@ void syms_of_w32menu ()
   Qdebug_on_next_call = intern ("debug-on-next-call");
   staticpro (&Qdebug_on_next_call);
 
-  DEFVAR_LISP ("menu-updating-frame", &Vmenu_updating_frame,
-              doc: /* Frame for which we are updating a menu.
-The enable predicate for a menu command should check this variable.  */);
-  Vmenu_updating_frame = Qnil;
-
   defsubr (&Sx_popup_menu);
 #ifdef HAVE_MENUS
   defsubr (&Sx_popup_dialog);