Mercurial > emacs
changeset 11613:c4ef6460a9c9
(read_char, read_char_x_menu_prompt): Exclude
menu-bar clicks when processing mouse clicks.
| author | Karl Heuer <kwzh@gnu.org> |
|---|---|
| date | Sat, 29 Apr 1995 04:20:12 +0000 |
| parents | 00bf6e6098d4 |
| children | fdd0d5bdd8c6 |
| files | src/keyboard.c |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keyboard.c Sat Apr 29 04:19:45 1995 +0000 +++ b/src/keyboard.c Sat Apr 29 04:20:12 1995 +0000 @@ -1820,7 +1820,9 @@ does not pass on any keymaps. */ if (nmaps > 0 && INTERACTIVE - && !NILP (prev_event) && EVENT_HAS_PARAMETERS (prev_event) + && !NILP (prev_event) + && EVENT_HAS_PARAMETERS (prev_event) + && !EQ (XCONS (prev_event)->car, Qmenu_bar) /* Don't bring up a menu if we already have another event. */ && NILP (Vunread_command_events) && unread_command_char < 0) @@ -4622,7 +4624,8 @@ #if (defined (HAVE_X_WINDOWS) && defined (HAVE_X_MENU)) || defined (MSDOS) /* If we got to this point via a mouse click, use a real menu for mouse selection. */ - if (EVENT_HAS_PARAMETERS (prev_event)) + if (EVENT_HAS_PARAMETERS (prev_event) + && !EQ (XCONS (prev_event)->car, Qmenu_bar)) { /* Display the menu and get the selection. */ Lisp_Object *realmaps