diff options
| author | Po Lu | 2022-07-08 10:44:49 +0800 |
|---|---|---|
| committer | Po Lu | 2022-07-08 10:44:49 +0800 |
| commit | b6a90b71a2e421d3eef52d4d9e9a82592b7ad277 (patch) | |
| tree | f749abcb30f442ac52795219667699fc221e9a03 /src | |
| parent | 139eb1f845d1ec3e2a26aec5d7fafbcdcbaa5f07 (diff) | |
| download | emacs-b6a90b71a2e421d3eef52d4d9e9a82592b7ad277.tar.gz emacs-b6a90b71a2e421d3eef52d4d9e9a82592b7ad277.zip | |
Fix returned action symbol upon "xterm" drop
* src/xterm.c (x_dnd_do_unsupported_drop): Set
x_dnd_action_symbol.
(x_dnd_begin_drag_and_drop): Don't clear it afterwards.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c index d057bbf06c2..094449e1d56 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -3921,6 +3921,8 @@ x_dnd_do_unsupported_drop (struct x_display_info *dpyinfo, | |||
| 3921 | True, ButtonReleaseMask, &event); | 3921 | True, ButtonReleaseMask, &event); |
| 3922 | x_stop_ignoring_errors (dpyinfo); | 3922 | x_stop_ignoring_errors (dpyinfo); |
| 3923 | 3923 | ||
| 3924 | x_dnd_action_symbol = QXdndActionPrivate; | ||
| 3925 | |||
| 3924 | return; | 3926 | return; |
| 3925 | 3927 | ||
| 3926 | cancel: | 3928 | cancel: |
| @@ -11873,8 +11875,7 @@ x_dnd_begin_drag_and_drop (struct frame *f, Time time, Atom xaction, | |||
| 11873 | XFIXNUM (Fnth (make_fixnum (4), | 11875 | XFIXNUM (Fnth (make_fixnum (4), |
| 11874 | x_dnd_unsupported_drop_data)), | 11876 | x_dnd_unsupported_drop_data)), |
| 11875 | x_dnd_unsupported_drop_time); | 11877 | x_dnd_unsupported_drop_time); |
| 11876 | 11878 | else if (SYMBOLP (val)) | |
| 11877 | if (SYMBOLP (val)) | ||
| 11878 | x_dnd_action_symbol = val; | 11879 | x_dnd_action_symbol = val; |
| 11879 | 11880 | ||
| 11880 | x_dnd_unwind_flag = false; | 11881 | x_dnd_unwind_flag = false; |