summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2020-01-19 23:40:45 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2020-01-19 23:41:23 -0800
commit6cc1db8174bcbe4fabc3627505a7d945cae7029d (patch)
tree26686c378f260370e1f345446680bf46f2bd299e
parent46fefb09745abbcdb4b56d80cd2bbd545afc39e1 (diff)
downloademacs-6cc1db8174bcbe4fabc3627505a7d945cae7029d.tar.gz
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
-rw-r--r--lisp/x-dnd.el4
1 files changed, 3 insertions, 1 deletions
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