aboutsummaryrefslogtreecommitdiffstats
path: root/src/macmenu.c
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2006-09-10 05:52:01 +0000
committerYAMAMOTO Mitsuharu2006-09-10 05:52:01 +0000
commit0e9ffc04d9c63bc7a56e6cd98097c76c957e92c2 (patch)
tree5885753daf2739126751175e983926dbd6ed024f /src/macmenu.c
parent267fb7e271a0b8ac648f9a60c52caa373aaea237 (diff)
downloademacs-0e9ffc04d9c63bc7a56e6cd98097c76c957e92c2.tar.gz
emacs-0e9ffc04d9c63bc7a56e6cd98097c76c957e92c2.zip
* 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/macmenu.c')
-rw-r--r--src/macmenu.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/macmenu.c b/src/macmenu.c
index e7d69d5657c..72ab9f90667 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -158,10 +158,10 @@ typedef struct _widget_value
158#define FALSE 0 158#define FALSE 0
159#endif /* no TRUE */ 159#endif /* no TRUE */
160 160
161Lisp_Object Vmenu_updating_frame;
162
163Lisp_Object Qdebug_on_next_call; 161Lisp_Object Qdebug_on_next_call;
164 162
163extern Lisp_Object Vmenu_updating_frame;
164
165extern Lisp_Object Qmenu_bar, Qmac_apple_event; 165extern Lisp_Object Qmenu_bar, Qmac_apple_event;
166 166
167extern Lisp_Object QCtoggle, QCradio; 167extern Lisp_Object QCtoggle, QCradio;
@@ -2630,11 +2630,6 @@ syms_of_macmenu ()
2630 Qdebug_on_next_call = intern ("debug-on-next-call"); 2630 Qdebug_on_next_call = intern ("debug-on-next-call");
2631 staticpro (&Qdebug_on_next_call); 2631 staticpro (&Qdebug_on_next_call);
2632 2632
2633 DEFVAR_LISP ("menu-updating-frame", &Vmenu_updating_frame,
2634 doc: /* Frame for which we are updating a menu.
2635The enable predicate for a menu command should check this variable. */);
2636 Vmenu_updating_frame = Qnil;
2637
2638 defsubr (&Sx_popup_menu); 2633 defsubr (&Sx_popup_menu);
2639#ifdef HAVE_MENUS 2634#ifdef HAVE_MENUS
2640 defsubr (&Sx_popup_dialog); 2635 defsubr (&Sx_popup_dialog);