Mercurial > emacs
changeset 72773:15d914de92fd
* 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.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Sun, 10 Sep 2006 05:52:01 +0000 |
| parents | caccf1b92ded |
| children | e00572984112 |
| files | src/macmenu.c src/w32menu.c |
| diffstat | 2 files changed, 4 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macmenu.c Sun Sep 10 05:51:45 2006 +0000 +++ b/src/macmenu.c Sun Sep 10 05:52:01 2006 +0000 @@ -158,10 +158,10 @@ #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 @@ 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);
--- a/src/w32menu.c Sun Sep 10 05:51:45 2006 +0000 +++ b/src/w32menu.c Sun Sep 10 05:52:01 2006 +0000 @@ -149,9 +149,9 @@ SetMenuItemInfoA_Proc set_menu_item_info = NULL; AppendMenuW_Proc unicode_append_menu = NULL; -Lisp_Object Vmenu_updating_frame; +Lisp_Object Qdebug_on_next_call; -Lisp_Object Qdebug_on_next_call; +extern Lisp_Object Vmenu_updating_frame; extern Lisp_Object Qmenu_bar; @@ -2548,11 +2548,6 @@ 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);