master 6cc1db8: Fix drag and drop from some Qt versions

[Paul Eggert]

branch: master
commit 6cc1db8174bcbe4fabc3627505a7d945cae7029d
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    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
---
 lisp/x-dnd.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 4297ef4..b22af5cc 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