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 4297ef4ed4a4995ae46b274c45688d8830149356..b22af5cc770732e0d5a2f40c731013628ab40b9d 100644 (file)
--- 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