* lisp/avoid.el (mouse-avoidance-ignore-p): Ignore mouse when it is

hidden by `make-pointer-invisible'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b7a06b309cf70fc0e1f95334ece1b94fb9f09314..949e7d40e3d71595234f436ec06f688ae0beecba 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-18  Julien Danjou  <julien@danjou.info>
+
+       * avoid.el (mouse-avoidance-ignore-p): Ignore mouse when it is
+       hidden by `make-pointer-invisible'.
+
 2010-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * files.el (locate-file-completion-table): Strip non-matching elements

diff --git a/lisp/avoid.el b/lisp/avoid.el
index adfb1dd78c800e3eec8c2f66d3d5a51ce0dc7f36..4b713b827b6e6e6c9a81de67a0a4a9c5528a30ce 100644 (file)
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -278,7 +278,8 @@ redefine this function to suit your own tastes."
 
 (defun mouse-avoidance-ignore-p ()
   (let ((mp (mouse-position)))
-    (or executing-kbd-macro           ; don't check inside macro
+    (or (not (frame-pointer-visible-p)) ; The pointer is hidden
+        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 do anything if last event was a mouse event.