diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2006-11-06 16:47:07 +0000 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2006-11-06 16:47:07 +0000 |
commit | c1f043a06378a5a3f6f5dd5b7b1b383439ebc9ef (patch) | |
tree | c44a093328db5295e98de9e97824449e44ae4b69 /src/macmenu.c | |
parent | e8407323ab788fa2d20ab58b451991f728d61339 (diff) | |
download | emacs-c1f043a06378a5a3f6f5dd5b7b1b383439ebc9ef.tar.gz |
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Diffstat (limited to 'src/macmenu.c')
-rw-r--r-- | src/macmenu.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/macmenu.c b/src/macmenu.c index ce0bc6eea54..d8303dbdc25 100644 --- a/src/macmenu.c +++ b/src/macmenu.c @@ -1052,17 +1052,6 @@ x_activate_menubar (f) UNBLOCK_INPUT; } -/* 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. */) - () -{ - /* Always return Qnil since menu selection functions do not return - until a selection has been made or cancelled. */ - return Qnil; -} - /* Find the menu selection and store it in the keyboard buffer. F is the frame the menu is on. MENU_BAR_ITEMS_USED is the length of VECTOR. @@ -2653,6 +2642,17 @@ dispose_menus (kind, id) } #endif /* HAVE_MENUS */ + +/* 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. */) + () +{ + /* Always return Qnil since menu selection functions do not return + until a selection has been made or cancelled. */ + return Qnil; +} void syms_of_macmenu () |