Simplify url handling in rcirc-mode

[gnu-emacs] / lisp / avoid.el

diff --git a/lisp/avoid.el b/lisp/avoid.el
index c9c989b2ab99093db87b50607d46f857f669364b..038927105ec8066a0d78477192074d12364e5413 100644 (file)
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -1,7 +1,6 @@
 ;;; avoid.el --- make mouse pointer stay out of the way of editing
 
-;; Copyright (C) 1993, 1994, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2000-2011 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: mouse
@@ -277,7 +276,9 @@ 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
+        (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)))
        ;; Don't do anything if last event was a mouse event.
@@ -407,5 +408,4 @@ definition of \"random distance\".)"
 (if mouse-avoidance-mode
     (mouse-avoidance-mode mouse-avoidance-mode))
 
-;; arch-tag: 64ad4ef8-a870-4183-8d96-3aa93b7a6800
 ;;; avoid.el ends here