* menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 9 Nov 2009 06:21:03 +0000 (06:21 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 9 Nov 2009 06:21:03 +0000 (06:21 +0000)
commitef7417fd760526133c9217e7857ac7111263c46d
treedfd608095d671f022a54839198993f2e3c556c33
parent4359a806d0afe62a154f1aedde8fbc93f261de7c
* menu.c (Fx_popup_menu): Consolidate versions from xmenu.c,
w32menu.c, and nsmenu.m.
Simplify the obsolete case where position is nil.
(cleanup_popup_menu): New function, moved from nsmenu.m.
(struct skp): Remove slot `notreal'.
(single_keymap_panes, keymap_panes): Remove arg `notreal' and adjust callers.
(single_menu_item): Adjust call to parse_menu_item.
(syms_of_menu): Defsubr x-popup-menu.
* menu.h (Vmenu_updating_frame): Consolidate declarations from *menu.c.
(keymap_panes): Don't export any more.
(mouse_position_for_popup, w32_menu_show, ns_menu_show, xmenu_show): Declare.
* keyboard.c (parse_menu_item): Remove arg `notreal'.
(menu_bar_item, read_char_minibuf_menu_prompt): Adjust callers.
* keyboard.h (parse_menu_item): Update declaration.
* xmenu.c (Fx_popup_menu): Remove.
(syms_of_xmenu): Don't defsubr x-popup-menu.
* w32menu.c (Fx_popup_menu): Remove.
(syms_of_w32menu): Don't defsubr x-popup-menu.
* nsmenu.m (cleanup_popup_menu): Remove.
(ns_menu_show): Rename from ns_popup_menu and remove all the code
moved to menu.c's Fx_popup_menu.
(Fx_popup_menu): Remove.
(syms_of_nsmenu): Don't defsubr x-popup-menu, and don't initialize
menu_items (it's done in menu.c already).
src/ChangeLog
src/keyboard.c
src/keyboard.h
src/menu.c
src/menu.h
src/nsmenu.m
src/w32menu.c
src/xmenu.c