From: Julien Danjou <julien@danjou.info>
Date: Mon, 18 Oct 2010 21:10:38 +0000 (-0400)
Subject: * lisp/avoid.el (mouse-avoidance-ignore-p): Ignore mouse when it is
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~571
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=36ba6f0730619d7aef25f094418cff7b4c86f72a;p=emacs.git

* 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 b7a06b309cf..949e7d40e3d 100644
--- 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 adfb1dd78c8..4b713b827b6 100644
--- 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.