diff options
| author | Karl Heuer <kwzh@gnu.org> | 1995-02-22 06:07:20 +0000 |
|---|---|---|
| committer | Karl Heuer <kwzh@gnu.org> | 1995-02-22 06:07:20 +0000 |
| commit | 1e40a7d76394f1695d99c00700541a88bcb85e9a (patch) | |
| tree | 2c520059884cdb8b66cb0c3848b9bd18df1eca6e /src/xmenu.c | |
| parent | 168768a3967406f440d2a53867454da1fd0f9914 (diff) | |
| download | emacs-1e40a7d76394f1695d99c00700541a88bcb85e9a.tar.gz | |
(menubar_selection_callback): frame_or_window field of a menu-bar event now
includes both the frame and the magic cookie.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index 4503c64d612..5fc000c7bde 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1104,40 +1104,40 @@ menubar_selection_callback (widget, id, client_data) } else if (EQ (XVECTOR (vector)->contents[i], Qt)) { - prefix - = XVECTOR (vector)->contents[i + MENU_ITEMS_PANE_PREFIX]; + prefix = XVECTOR (vector)->contents[i + MENU_ITEMS_PANE_PREFIX]; i += MENU_ITEMS_PANE_LENGTH; } else { - entry - = XVECTOR (vector)->contents[i + MENU_ITEMS_ITEM_VALUE]; + entry = XVECTOR (vector)->contents[i + MENU_ITEMS_ITEM_VALUE]; if ((int) client_data == i) { int j; struct input_event buf; + Lisp_Object frame; + XSETFRAME (frame, f); buf.kind = menu_bar_event; - buf.frame_or_window = Qmenu_bar; + buf.frame_or_window = Fcons (frame, Qmenu_bar); kbd_buffer_store_event (&buf); for (j = 0; j < submenu_depth; j++) if (!NILP (subprefix_stack[j])) { buf.kind = menu_bar_event; - buf.frame_or_window = subprefix_stack[j]; + buf.frame_or_window = Fcons (frame, subprefix_stack[j]); kbd_buffer_store_event (&buf); } if (!NILP (prefix)) { buf.kind = menu_bar_event; - buf.frame_or_window = prefix; + buf.frame_or_window = Fcons (frame, prefix); kbd_buffer_store_event (&buf); } buf.kind = menu_bar_event; - buf.frame_or_window = entry; + buf.frame_or_window = Fcons (frame, entry); kbd_buffer_store_event (&buf); return; |