From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 12 Nov 2006 17:52:29 +0000 (+0000)
Subject: (popup_activated): Define outside HAVE_MENUS.
X-Git-Tag: emacs-pretest-22.0.91~116
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/b79b8a1c520eec3863903a17ac294a556ea7730f

(popup_activated): Define outside HAVE_MENUS.
---

diff --git a/src/xmenu.c b/src/xmenu.c
index 24be4fd5cb..037422abde 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1488,14 +1488,6 @@ x_activate_menubar (f)
   f->output_data.x->saved_menu_event->type = 0;
 }
 
-/* Detect if a dialog or menu has been posted.  */
-
-int
-popup_activated ()
-{
-  return popup_activated_flag;
-}
-
 /* This callback is invoked when the user selects a menubar cascade
    pushbutton, but before the pulldown menu is posted.  */
 
@@ -3762,6 +3754,13 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
 
 #endif /* HAVE_MENUS */
 
+/* Detect if a dialog or menu has been posted.  */
+
+int
+popup_activated ()
+{
+  return popup_activated_flag;
+}
 
 /* The following is used by delayed window autoselection.  */