diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-10 14:06:17 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-10-10 14:06:17 +0400 |
| commit | 6bbe6da82dd61d050a773602f272dc4750291302 (patch) | |
| tree | 533463c1ba5b80dbf2acac602f8c7a13fe18d666 /src/menu.h | |
| parent | 6c8413fce16569e3883b48e64cd5da2a37a209d6 (diff) | |
| download | emacs-6bbe6da82dd61d050a773602f272dc4750291302.tar.gz | |
* keyboard.c (last_event_timestamp): Remove. For X selection and
GTK popup menus, it may be obtained from per-frame X display info.
(kbd_buffer_store_event_hold, kbd_buffer_get_event)
(process_special_events): Adjust users.
* keyboard.h (last_event_timestamp): Remove declaration.
* xmenu.c (xmenu_show, create_and_show_popup_menu): Lost last arg.
Use FRAME_DISPLAY_INFO (f)->last_user_time for gtk_menu_popup.
* menu.h (xmenu_show): Adjust prototype.
* menu.c (Fx_popup_menu): Adjust user.
* xselect.c (x_own_selection, x_get_foreign_selection)
(Fx_disown_selection_internal): Use dpyinfo->last_user_time.
Diffstat (limited to 'src/menu.h')
| -rw-r--r-- | src/menu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/menu.h b/src/menu.h index c83f7431c45..17d66290647 100644 --- a/src/menu.h +++ b/src/menu.h @@ -50,7 +50,7 @@ extern Lisp_Object w32_menu_show (struct frame *, int, int, int, int, extern Lisp_Object ns_menu_show (struct frame *, int, int, bool, bool, Lisp_Object, const char **); extern Lisp_Object xmenu_show (struct frame *, int, int, bool, bool, - Lisp_Object, const char **, Time); + Lisp_Object, const char **); extern Lisp_Object tty_menu_show (struct frame *, int, int, int, int, Lisp_Object, int, const char **); extern ptrdiff_t menu_item_width (const unsigned char *); |