diff options
| author | Po Lu <luangruo@yahoo.com> | 2022-06-30 09:45:49 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2022-06-30 09:46:41 +0800 |
| commit | e161b5fa3c8241a34961b378501247fb3978e6dc (patch) | |
| tree | 43d3ca65518a6041a149622a104d0fc7a9b2beaf /src/xterm.h | |
| parent | d7dc8c5fe4ac1735a7565473621d7504cc5ef089 (diff) | |
| download | emacs-e161b5fa3c8241a34961b378501247fb3978e6dc.tar.gz | |
Fix preservation of the original value of PRIMARY after dropping on xterm
* src/xselect.c (x_own_selection): New arg `dnd_data'. Record
it.
(x_get_local_selection, x_handle_selection_request)
(x_convert_selection): Convert the DND data instead if the
situation warrants.
(Fx_own_selection_internal, Fx_get_selection_internal)
(Fx_get_local_selection): Update calls to x_get_local_selection.
* src/xterm.c (x_dnd_do_unsupported_drop): If obtaining
selection ownership failed, return. Record DND value and
preserve the current value of PRIMARY, if it exists.
* src/xterm.h: Update prototypes.
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xterm.h b/src/xterm.h index f7b93529cbd..76d35aaf34f 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -1600,7 +1600,8 @@ extern void x_clipboard_manager_save_all (void); extern Lisp_Object x_timestamp_for_selection (struct x_display_info *, Lisp_Object); extern void x_set_pending_dnd_time (Time); -extern void x_own_selection (Lisp_Object, Lisp_Object, Lisp_Object); +extern void x_own_selection (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object, Time); extern Atom x_intern_cached_atom (struct x_display_info *, const char *, bool); extern char *x_get_atom_name (struct x_display_info *, Atom, bool *) |