Mercurial > hg > xemacs-beta
comparison src/event-stream.c @ 179:9ad43877534d r20-3b16
Import from CVS: tag r20-3b16
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:52:19 +0200 |
parents | 6075d714658b |
children | bfd6434d15b3 |
comparison
equal
deleted
inserted
replaced
178:e703507b8a00 | 179:9ad43877534d |
---|---|
3650 | 3650 |
3651 if (XEVENT_TYPE (evee) == misc_user_event) | 3651 if (XEVENT_TYPE (evee) == misc_user_event) |
3652 return Qnil; | 3652 return Qnil; |
3653 | 3653 |
3654 /* if we're currently in a menu accelerator, check there for further events */ | 3654 /* if we're currently in a menu accelerator, check there for further events */ |
3655 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBAR) | 3655 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS) |
3656 if (lw_menu_active) | 3656 if (lw_menu_active) |
3657 { | 3657 { |
3658 result = command_builder_operate_menu_accelerator (builder); | 3658 result = command_builder_operate_menu_accelerator (builder); |
3659 return result; | 3659 return result; |
3660 } | 3660 } |
3664 if (EQ (Vmenu_accelerator_enabled, Qmenu_force)) | 3664 if (EQ (Vmenu_accelerator_enabled, Qmenu_force)) |
3665 result = command_builder_find_menu_accelerator (builder); | 3665 result = command_builder_find_menu_accelerator (builder); |
3666 if (NILP (result)) | 3666 if (NILP (result)) |
3667 #endif | 3667 #endif |
3668 result = command_builder_find_leaf_1 (builder); | 3668 result = command_builder_find_leaf_1 (builder); |
3669 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBAR) | 3669 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS) |
3670 if (NILP (result) | 3670 if (NILP (result) |
3671 && EQ (Vmenu_accelerator_enabled, Qmenu_fallback)) | 3671 && EQ (Vmenu_accelerator_enabled, Qmenu_fallback)) |
3672 result = command_builder_find_menu_accelerator (builder); | 3672 result = command_builder_find_menu_accelerator (builder); |
3673 } | 3673 } |
3674 #endif | 3674 #endif |
4862 DEFSUBR (Fdispatch_event); | 4862 DEFSUBR (Fdispatch_event); |
4863 DEFSUBR (Fread_key_sequence); | 4863 DEFSUBR (Fread_key_sequence); |
4864 DEFSUBR (Fthis_command_keys); | 4864 DEFSUBR (Fthis_command_keys); |
4865 DEFSUBR (Freset_this_command_lengths); | 4865 DEFSUBR (Freset_this_command_lengths); |
4866 DEFSUBR (Fopen_dribble_file); | 4866 DEFSUBR (Fopen_dribble_file); |
4867 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBAR) | |
4867 DEFSUBR (Faccelerate_menu); | 4868 DEFSUBR (Faccelerate_menu); |
4869 #endif | |
4868 | 4870 |
4869 defsymbol (&Qpre_command_hook, "pre-command-hook"); | 4871 defsymbol (&Qpre_command_hook, "pre-command-hook"); |
4870 defsymbol (&Qpost_command_hook, "post-command-hook"); | 4872 defsymbol (&Qpost_command_hook, "post-command-hook"); |
4871 defsymbol (&Qunread_command_events, "unread-command-events"); | 4873 defsymbol (&Qunread_command_events, "unread-command-events"); |
4872 defsymbol (&Qunread_command_event, "unread-command-event"); | 4874 defsymbol (&Qunread_command_event, "unread-command-event"); |