From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 14 Apr 2024 10:16:29 +0000 (+0300)
Subject: * lisp/dnd.el (dnd-handle-movement): Avoid errors (bug#70311).
X-Git-Tag: archive/raspbian/1%29.4+1-4+rpi1~1^2~2^2~17^2~62
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5971aa1fd32583a8d50b67a56cf1b40f1665fca0;p=emacs.git

* lisp/dnd.el (dnd-handle-movement): Avoid errors (bug#70311).
---

diff --git a/lisp/dnd.el b/lisp/dnd.el
index 89652d32abf..b68dc269354 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -149,8 +149,13 @@ Windows."
                 (with-selected-window window
                   (scroll-down 1))))))))
       (when dnd-indicate-insertion-point
-        (ignore-errors
-          (goto-char (posn-point posn)))))))
+        (let ((pos (posn-point posn)))
+          ;; We avoid errors here, since on some systems this runs
+          ;; when waiting_for_input is non-zero, and that aborts on
+          ;; error.
+          (if (and pos (<= (point-min) pos (point-max)))
+              (goto-char pos)
+            pos))))))
 
 (defun dnd-handle-one-url (window action url)
   "Handle one dropped url by calling the appropriate handler.