]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix returned action symbol upon "xterm" drop
authorPo Lu <luangruo@yahoo.com>
Fri, 8 Jul 2022 02:44:49 +0000 (10:44 +0800)
committerPo Lu <luangruo@yahoo.com>
Fri, 8 Jul 2022 02:44:49 +0000 (10:44 +0800)
* src/xterm.c (x_dnd_do_unsupported_drop): Set
x_dnd_action_symbol.
(x_dnd_begin_drag_and_drop): Don't clear it afterwards.

src/xterm.c

index d057bbf06c2186476231532567f48521dc2c7db5..094449e1d5651a3bf49613c8c8fe8d7cc33538f7 100644 (file)
@@ -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;