diff options
| author | Paul Eggert | 2020-01-19 23:40:45 -0800 |
|---|---|---|
| committer | Paul Eggert | 2020-01-19 23:41:23 -0800 |
| commit | 6cc1db8174bcbe4fabc3627505a7d945cae7029d (patch) | |
| tree | 26686c378f260370e1f345446680bf46f2bd299e | |
| parent | 46fefb09745abbcdb4b56d80cd2bbd545afc39e1 (diff) | |
| download | emacs-6cc1db8174bcbe4fabc3627505a7d945cae7029d.tar.gz emacs-6cc1db8174bcbe4fabc3627505a7d945cae7029d.zip | |
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.el | 4 |
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." | |||
| 485 | ((equal "XdndDrop" message) | 485 | ((equal "XdndDrop" message) |
| 486 | (if (windowp window) (select-window window)) | 486 | (if (windowp window) (select-window window)) |
| 487 | (let* ((dnd-source (aref data 0)) | 487 | (let* ((dnd-source (aref data 0)) |
| 488 | (timestamp (aref data 2)) | ||
| 488 | (value (and (x-dnd-current-type window) | 489 | (value (and (x-dnd-current-type window) |
| 489 | (x-get-selection-internal | 490 | (x-get-selection-internal |
| 490 | 'XdndSelection | 491 | 'XdndSelection |
| 491 | (intern (x-dnd-current-type window))))) | 492 | (intern (x-dnd-current-type window)) |
| 493 | timestamp))) | ||
| 492 | success action) | 494 | success action) |
| 493 | 495 | ||
| 494 | (setq action (if value | 496 | (setq action (if value |