emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 94ecd2b3c6: Check display when handling XdndFinished events


From: Po Lu
Subject: master 94ecd2b3c6: Check display when handling XdndFinished events
Date: Fri, 29 Apr 2022 20:48:27 -0400 (EDT)

branch: master
commit 94ecd2b3c664387cd703fb639d6909a9e6bf551b
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Check display when handling XdndFinished events
    
    * src/xterm.c (handle_one_xevent): Check that the display is
    actually the one we want before finishing DND.
---
 src/xterm.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/xterm.c b/src/xterm.c
index 51828795c5..28c435afde 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -14077,6 +14077,10 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 
        if (event->xclient.message_type == dpyinfo->Xatom_XdndFinished
            && (x_dnd_waiting_for_finish && !x_dnd_waiting_for_motif_finish)
+           /* Also check that the display is correct, since
+              `x_dnd_pending_finish_target' could still be valid on
+              another X server.  */
+           && dpyinfo->display == x_dnd_finish_display
            && event->xclient.data.l[0] == x_dnd_pending_finish_target)
          {
            x_dnd_waiting_for_finish = false;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]