Mercurial > emacs
comparison src/w32menu.c @ 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 | 6e63f47b8977 |
children | 3901ff3eaf2c a1a25ac6c88a |
comparison
equal
deleted
inserted
replaced
72772:caccf1b92ded | 72773:15d914de92fd |
---|---|
147 | 147 |
148 GetMenuItemInfoA_Proc get_menu_item_info = NULL; | 148 GetMenuItemInfoA_Proc get_menu_item_info = NULL; |
149 SetMenuItemInfoA_Proc set_menu_item_info = NULL; | 149 SetMenuItemInfoA_Proc set_menu_item_info = NULL; |
150 AppendMenuW_Proc unicode_append_menu = NULL; | 150 AppendMenuW_Proc unicode_append_menu = NULL; |
151 | 151 |
152 Lisp_Object Vmenu_updating_frame; | |
153 | |
154 Lisp_Object Qdebug_on_next_call; | 152 Lisp_Object Qdebug_on_next_call; |
153 | |
154 extern Lisp_Object Vmenu_updating_frame; | |
155 | 155 |
156 extern Lisp_Object Qmenu_bar; | 156 extern Lisp_Object Qmenu_bar; |
157 | 157 |
158 extern Lisp_Object QCtoggle, QCradio; | 158 extern Lisp_Object QCtoggle, QCradio; |
159 | 159 |
2546 current_popup_menu = NULL; | 2546 current_popup_menu = NULL; |
2547 | 2547 |
2548 Qdebug_on_next_call = intern ("debug-on-next-call"); | 2548 Qdebug_on_next_call = intern ("debug-on-next-call"); |
2549 staticpro (&Qdebug_on_next_call); | 2549 staticpro (&Qdebug_on_next_call); |
2550 | 2550 |
2551 DEFVAR_LISP ("menu-updating-frame", &Vmenu_updating_frame, | |
2552 doc: /* Frame for which we are updating a menu. | |
2553 The enable predicate for a menu command should check this variable. */); | |
2554 Vmenu_updating_frame = Qnil; | |
2555 | |
2556 defsubr (&Sx_popup_menu); | 2551 defsubr (&Sx_popup_menu); |
2557 #ifdef HAVE_MENUS | 2552 #ifdef HAVE_MENUS |
2558 defsubr (&Sx_popup_dialog); | 2553 defsubr (&Sx_popup_dialog); |
2559 #endif | 2554 #endif |
2560 } | 2555 } |