summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuri Linkov <juri@linkov.net>2020-12-29 21:37:31 +0200
committerJuri Linkov <juri@linkov.net>2020-12-29 21:37:31 +0200
commitc13937ccb6c9ebf7a1dd9eaa7eb6bb3768409093 (patch)
tree747828da24aa9c4874b95c934d279671907e6003
parentbaac3562a669ef4570cc258b5e6fc6472a6c9407 (diff)
downloademacs-c13937ccb6c9ebf7a1dd9eaa7eb6bb3768409093.tar.gz
* lisp/x-dnd.el (x-dnd-get-drop-x-y): Add safer check for top/left (bug#45277)
-rw-r--r--lisp/x-dnd.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 1d49f462531..5af54903605 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -411,8 +411,10 @@ Coordinates are required to be absolute.
FRAME is the frame and W is the window where the drop happened.
If W is a window, return its absolute coordinates,
otherwise return the frame coordinates."
- (let* ((frame-left (frame-parameter frame 'left))
- (frame-top (frame-parameter frame 'top)))
+ (let* ((frame-left (or (car-safe (cdr-safe (frame-parameter frame 'left)))
+ (frame-parameter frame 'left)))
+ (frame-top (or (car-safe (cdr-safe (frame-parameter frame 'top)))
+ (frame-parameter frame 'top))))
(if (windowp w)
(let ((edges (window-inside-pixel-edges w)))
(cons