From: Julien Danjou <julien@danjou.info>
Date: Thu, 10 Mar 2011 02:14:55 +0000 (-0500)
Subject: Inhibit mouse-avoidance if cursor-type is nil (Bug#8209).
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~618
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec6ecaed88d6b6fbc966acf14b4fdd2f3ee37227;p=emacs.git

Inhibit mouse-avoidance if cursor-type is nil (Bug#8209).

* lisp/avoid.el (mouse-avoidance-ignore-p): Do not move the cursor if
`cursor-type' is nil.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 351f7f1f58d..3ad3c7f151a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-10  Julien Danjou  <julien@danjou.info>
+
+	* avoid.el (mouse-avoidance-ignore-p): Do not move the cursor if
+	`cursor-type' is nil.
+
 2011-03-09  Jay Belanger  <jay.p.belanger@gmail.com>
 
 	* calc/calc.el (calc-mode-map): Don't bind "C-_" to `calc-missing-key'.
diff --git a/lisp/avoid.el b/lisp/avoid.el
index fe47a0c4a33..c864d48e9ce 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -278,6 +278,7 @@ redefine this function to suit your own tastes."
 (defun mouse-avoidance-ignore-p ()
   (let ((mp (mouse-position)))
     (or (not (frame-pointer-visible-p)) ; The pointer is hidden
+        (not cursor-type)               ; There's no cursor
         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)))