From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 9 Sep 2006 17:51:17 +0000 (+0000)
Subject: (Vmenu_updating_frame): Don't define here.
X-Git-Tag: emacs-pretest-22.0.90~664
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4248ca0c2f57ea1f62afab346275196c06cb1bf3;p=emacs.git

(Vmenu_updating_frame): Don't define here.
(syms_of_xmenu): Don't DEFVAR it here.
---

diff --git a/src/xmenu.c b/src/xmenu.c
index 5a71d82a424..574240a4560 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -97,10 +97,10 @@ Boston, MA 02110-1301, USA.  */
 #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;
 
 extern Lisp_Object QCtoggle, QCradio;
@@ -3758,11 +3758,6 @@ syms_of_xmenu ()
   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;
-
 #ifdef USE_X_TOOLKIT
   widget_id_tick = (1<<16);
   next_menubar_widget_id = 1;