diff options
| author | YAMAMOTO Mitsuharu <[email protected]> | 2006-09-10 05:52:01 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <[email protected]> | 2006-09-10 05:52:01 +0000 |
| commit | 0e9ffc04d9c63bc7a56e6cd98097c76c957e92c2 (patch) | |
| tree | 5885753daf2739126751175e983926dbd6ed024f /src | |
| parent | 267fb7e271a0b8ac648f9a60c52caa373aaea237 (diff) | |
* 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/macmenu.c | 9 | ||||
| -rw-r--r-- | src/w32menu.c | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/src/macmenu.c b/src/macmenu.c index e7d69d5657..72ab9f9066 100644 --- 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 11af1d66b6..3a4dc20fc1 100644 --- 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); |