[Emacs-diffs] /srv/bzr/emacs/trunk r103610: Inhibit mouse-avoidance if cursor-type is nil (Bug#8209).

[Chong Yidong]

------------------------------------------------------------
revno: 103610
author: Julien Danjou  <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2011-03-09 21:14:55 -0500
message:
  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.
modified:
  lisp/ChangeLog
  lisp/avoid.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-09 23:38:16 +0000
+++ b/lisp/ChangeLog    2011-03-10 02:14:55 +0000
@@ -1,3 +1,8 @@
+2011-03-10  Julien Danjou  <address@hidden>
+
+       * avoid.el (mouse-avoidance-ignore-p): Do not move the cursor if
+       `cursor-type' is nil.
+
 2011-03-09  Jay Belanger  <address@hidden>
 
        * calc/calc.el (calc-mode-map): Don't bind "C-_" to `calc-missing-key'.

=== modified file 'lisp/avoid.el'
--- a/lisp/avoid.el     2011-01-25 04:08:28 +0000
+++ b/lisp/avoid.el     2011-03-10 02:14:55 +0000
@@ -278,6 +278,7 @@
 (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)))