diff options
| author | Po Lu | 2022-03-16 17:07:17 +0800 |
|---|---|---|
| committer | Po Lu | 2022-03-16 17:07:17 +0800 |
| commit | 1bf8eca626d67eb011e80079db76107e629332f6 (patch) | |
| tree | a2f0d23c0eb4cdeee6d44ce7b175108dff4a2059 /src | |
| parent | e8d7139b4e069f4641a7e11261541acb4c5fff7b (diff) | |
| download | emacs-1bf8eca626d67eb011e80079db76107e629332f6.tar.gz emacs-1bf8eca626d67eb011e80079db76107e629332f6.zip | |
Correct last change for return-frame drags
* src/xterm.c (handle_one_xevent): Use `x_any_window_to_frame'
to determine `x_dnd_return_frame_object'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xterm.c b/src/xterm.c index 83651376bfd..7d1a5f4043f 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -11669,11 +11669,11 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 11669 | x_dnd_return_frame = 2; | 11669 | x_dnd_return_frame = 2; |
| 11670 | 11670 | ||
| 11671 | if (x_dnd_return_frame == 2 | 11671 | if (x_dnd_return_frame == 2 |
| 11672 | && x_window_to_frame (dpyinfo, target)) | 11672 | && x_any_window_to_frame (dpyinfo, target)) |
| 11673 | { | 11673 | { |
| 11674 | x_dnd_in_progress = false; | 11674 | x_dnd_in_progress = false; |
| 11675 | x_dnd_return_frame_object | 11675 | x_dnd_return_frame_object |
| 11676 | = x_window_to_frame (dpyinfo, target); | 11676 | = x_any_window_to_frame (dpyinfo, target); |
| 11677 | x_dnd_return_frame = 3; | 11677 | x_dnd_return_frame = 3; |
| 11678 | } | 11678 | } |
| 11679 | 11679 | ||
| @@ -12903,11 +12903,11 @@ handle_one_xevent (struct x_display_info *dpyinfo, | |||
| 12903 | x_dnd_return_frame = 2; | 12903 | x_dnd_return_frame = 2; |
| 12904 | 12904 | ||
| 12905 | if (x_dnd_return_frame == 2 | 12905 | if (x_dnd_return_frame == 2 |
| 12906 | && x_window_to_frame (dpyinfo, target)) | 12906 | && x_any_window_to_frame (dpyinfo, target)) |
| 12907 | { | 12907 | { |
| 12908 | x_dnd_in_progress = false; | 12908 | x_dnd_in_progress = false; |
| 12909 | x_dnd_return_frame_object | 12909 | x_dnd_return_frame_object |
| 12910 | = x_window_to_frame (dpyinfo, target); | 12910 | = x_any_window_to_frame (dpyinfo, target); |
| 12911 | x_dnd_return_frame = 3; | 12911 | x_dnd_return_frame = 3; |
| 12912 | } | 12912 | } |
| 12913 | 12913 | ||