From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 5 Nov 2006 12:18:47 +0000 (+0000)
Subject: (Fmenu_or_popup_active_p): New function.
X-Git-Tag: emacs-pretest-22.0.91~333
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=508fb067d7fe7ee20be0dd7ca3232a3017e383f9;p=emacs.git

(Fmenu_or_popup_active_p): New function.
(syms_of_xmenu): Defsubr it.
---

diff --git a/src/xmenu.c b/src/xmenu.c
index 7c397fbd6e1..4882f8d0d6f 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1493,6 +1493,15 @@ popup_activated ()
   return popup_activated_flag;
 }
 
+/* The following is used by delayed window autoselection.  */
+
+DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0,
+       doc: /* Return t if a menu or popup dialog is active.  */)
+     ()
+{
+  return (popup_activated ()) ? Qt : Qnil;
+}
+
 /* This callback is invoked when the user selects a menubar cascade
    pushbutton, but before the pulldown menu is posted.  */
 
@@ -3775,6 +3784,7 @@ syms_of_xmenu ()
 #endif
 
   defsubr (&Sx_popup_menu);
+  defsubr (&Smenu_or_popup_active_p);
 
 #if defined (USE_GTK) || defined (USE_X_TOOLKIT)
   defsubr (&Smenu_bar_open);