diff options
| author | Chong Yidong | 2006-11-06 16:47:07 +0000 |
|---|---|---|
| committer | Chong Yidong | 2006-11-06 16:47:07 +0000 |
| commit | c1f043a06378a5a3f6f5dd5b7b1b383439ebc9ef (patch) | |
| tree | c44a093328db5295e98de9e97824449e44ae4b69 /src | |
| parent | e8407323ab788fa2d20ab58b451991f728d61339 (diff) | |
| download | emacs-c1f043a06378a5a3f6f5dd5b7b1b383439ebc9ef.tar.gz emacs-c1f043a06378a5a3f6f5dd5b7b1b383439ebc9ef.zip | |
(Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Diffstat (limited to 'src')
| -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) | |||
| 1052 | UNBLOCK_INPUT; | 1052 | UNBLOCK_INPUT; |
| 1053 | } | 1053 | } |
| 1054 | 1054 | ||
| 1055 | /* The following is used by delayed window autoselection. */ | ||
| 1056 | |||
| 1057 | DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0, | ||
| 1058 | doc: /* Return t if a menu or popup dialog is active. */) | ||
| 1059 | () | ||
| 1060 | { | ||
| 1061 | /* Always return Qnil since menu selection functions do not return | ||
| 1062 | until a selection has been made or cancelled. */ | ||
| 1063 | return Qnil; | ||
| 1064 | } | ||
| 1065 | |||
| 1066 | /* Find the menu selection and store it in the keyboard buffer. | 1055 | /* Find the menu selection and store it in the keyboard buffer. |
| 1067 | F is the frame the menu is on. | 1056 | F is the frame the menu is on. |
| 1068 | MENU_BAR_ITEMS_USED is the length of VECTOR. | 1057 | MENU_BAR_ITEMS_USED is the length of VECTOR. |
| @@ -2653,6 +2642,17 @@ dispose_menus (kind, id) | |||
| 2653 | } | 2642 | } |
| 2654 | 2643 | ||
| 2655 | #endif /* HAVE_MENUS */ | 2644 | #endif /* HAVE_MENUS */ |
| 2645 | |||
| 2646 | /* The following is used by delayed window autoselection. */ | ||
| 2647 | |||
| 2648 | DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0, | ||
| 2649 | doc: /* Return t if a menu or popup dialog is active. */) | ||
| 2650 | () | ||
| 2651 | { | ||
| 2652 | /* Always return Qnil since menu selection functions do not return | ||
| 2653 | until a selection has been made or cancelled. */ | ||
| 2654 | return Qnil; | ||
| 2655 | } | ||
| 2656 | 2656 | ||
| 2657 | void | 2657 | void |
| 2658 | syms_of_macmenu () | 2658 | syms_of_macmenu () |