From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 20 Jan 2020 07:40:45 +0000 (-0800)
Subject: Fix drag and drop from some Qt versions
X-Git-Tag: emacs-28.0.90~7908^2~95
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6cc1db8174bcbe4fabc3627505a7d945cae7029d;p=emacs.git

Fix drag and drop from some Qt versions

* lisp/x-dnd.el (x-dnd-handle-xdnd): Fix XdndDrop time stamp bug.
Problem and tiny change reported by Urs Fleisch (Bug#20804).
Copyright-paperwork-exempt: yes
---

diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 4297ef4ed4a..b22af5cc770 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -485,10 +485,12 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
 	((equal "XdndDrop" message)
 	 (if (windowp window) (select-window window))
 	 (let* ((dnd-source (aref data 0))
+		(timestamp (aref data 2))
 		(value (and (x-dnd-current-type window)
 			    (x-get-selection-internal
 			     'XdndSelection
-			     (intern (x-dnd-current-type window)))))
+			     (intern (x-dnd-current-type window))
+			     timestamp)))
 		success action)
 
 	   (setq action (if value