From: Po Lu <luangruo@yahoo.com>
Date: Fri, 8 Jul 2022 02:44:49 +0000 (+0800)
Subject: Fix returned action symbol upon "xterm" drop
X-Git-Tag: emacs-29.0.90~1447^2~1106
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6a90b71a2e421d3eef52d4d9e9a82592b7ad277;p=emacs.git

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.
---

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,
 	      True, ButtonReleaseMask, &event);
   x_stop_ignoring_errors (dpyinfo);
 
+  x_dnd_action_symbol = QXdndActionPrivate;
+
   return;
 
  cancel:
@@ -11873,8 +11875,7 @@ x_dnd_begin_drag_and_drop (struct frame *f, Time time, Atom xaction,
 					   XFIXNUM (Fnth (make_fixnum (4),
 							  x_dnd_unsupported_drop_data)),
 					   x_dnd_unsupported_drop_time);
-
-	      if (SYMBOLP (val))
+	      else if (SYMBOLP (val))
 		x_dnd_action_symbol = val;
 
 	      x_dnd_unwind_flag = false;