diff options
Diffstat (limited to 'lisp/avoid.el')
| -rw-r--r-- | lisp/avoid.el | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/avoid.el b/lisp/avoid.el index 0ad1b0ba535..43e5062b76c 100644 --- a/lisp/avoid.el +++ b/lisp/avoid.el @@ -205,8 +205,8 @@ If you want the mouse banished to a different corner set 'frame-or-window mouse-avoidance-banish-position 'eq)) (list-values (pcase fra-or-win - (`frame (list 0 0 (frame-width) (frame-height))) - (`window (window-edges)))) + ('frame (list 0 0 (frame-width) (frame-height))) + ('window (window-edges)))) (alist (cl-loop for v in list-values for k in '(left top right bottom) collect (cons k v))) @@ -223,11 +223,11 @@ If you want the mouse banished to a different corner set 'top-or-bottom-pos mouse-avoidance-banish-position #'eq)) (side-fn (pcase side - (`left '+) - (`right '-))) + ('left '+) + ('right '-))) (top-or-bottom-fn (pcase top-or-bottom - (`top '+) - (`bottom '-)))) + ('top '+) + ('bottom '-)))) (cons (funcall side-fn ; -/+ (assoc-default side alist 'eq) ; right or left side-dist) ; distance from side @@ -327,6 +327,9 @@ redefine this function to suit your own tastes." executing-kbd-macro ; don't check inside macro (null (cadr mp)) ; don't move unless in an Emacs frame (not (eq (car mp) (selected-frame))) + ;; Don't interfere with ongoing `mouse-drag-and-drop-region' + ;; (Bug#36269). + (eq track-mouse 'dropping) ;; Don't do anything if last event was a mouse event. ;; FIXME: this code fails in the case where the mouse was moved ;; since the last key-press but without generating any event. |