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/xselect.c | |
| 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/xselect.c')
| -rw-r--r-- | src/xselect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xselect.c b/src/xselect.c index 5eb263d8d0c..b4f4f9d43b6 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -320,7 +320,7 @@ x_own_selection (Lisp_Object selection_name, Lisp_Object selection_value, Window selecting_window = FRAME_X_WINDOW (f); struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f); Display *display = dpyinfo->display; - Time timestamp = last_event_timestamp; + Time timestamp = dpyinfo->last_user_time; Atom selection_atom = symbol_to_x_atom (dpyinfo, selection_name); block_input (); @@ -1188,7 +1188,7 @@ x_get_foreign_selection (Lisp_Object selection_symbol, Lisp_Object target_type, struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f); Display *display = dpyinfo->display; Window requestor_window = FRAME_X_WINDOW (f); - Time requestor_time = last_event_timestamp; + Time requestor_time = dpyinfo->last_user_time; Atom target_property = dpyinfo->Xatom_EMACS_TMP; Atom selection_atom = symbol_to_x_atom (dpyinfo, selection_symbol); Atom type_atom = (CONSP (target_type) @@ -2067,7 +2067,7 @@ On MS-DOS, all this does is return non-nil if we own the selection. */) block_input (); if (NILP (time_object)) - timestamp = last_event_timestamp; + timestamp = dpyinfo->last_user_time; else CONS_TO_INTEGER (time_object, Time, timestamp); XSetSelectionOwner (dpyinfo->display, selection_atom, None, timestamp); |