Mercurial > emacs
changeset 30181:770a280db6ee
(menu_highlight_callback): Store help string in the
`arg' member of the input event; don't cons.
(menubar_selection_callback): Use the `arg' slot of input events
to queue additional information, instead of consing.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 13 Jul 2000 14:08:48 +0000 |
| parents | c36d4c8b21b6 |
| children | 73181a26fc85 |
| files | src/xmenu.c |
| diffstat | 1 files changed, 14 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xmenu.c Thu Jul 13 14:08:34 2000 +0000 +++ b/src/xmenu.c Thu Jul 13 14:08:48 2000 +0000 @@ -1222,7 +1222,8 @@ /* Store the help event. */ help = wv && wv->help ? build_string (wv->help) : Qnil; buf.kind = HELP_EVENT; - buf.frame_or_window = Fcons (frame, help); + buf.frame_or_window = frame; + buf.arg = help; kbd_buffer_store_event (&buf); } @@ -1280,27 +1281,31 @@ Lisp_Object frame; XSETFRAME (frame, f); - buf.kind = menu_bar_event; - buf.frame_or_window = Fcons (frame, Fcons (Qmenu_bar, Qnil)); + buf.kind = MENU_BAR_EVENT; + buf.frame_or_window = frame; + buf.arg = frame; 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 = Fcons (frame, subprefix_stack[j]); + buf.kind = MENU_BAR_EVENT; + buf.frame_or_window = frame; + buf.arg = subprefix_stack[j]; kbd_buffer_store_event (&buf); } if (!NILP (prefix)) { - buf.kind = menu_bar_event; - buf.frame_or_window = Fcons (frame, prefix); + buf.kind = MENU_BAR_EVENT; + buf.frame_or_window = frame; + buf.arg = prefix; kbd_buffer_store_event (&buf); } - buf.kind = menu_bar_event; - buf.frame_or_window = Fcons (frame, entry); + buf.kind = MENU_BAR_EVENT; + buf.frame_or_window = frame; + buf.arg = entry; kbd_buffer_store_event (&buf); return;