Add `auth-source-search' integration for LDAP searches.

[gnu-emacs] / lisp / avoid.el

diff --git a/lisp/avoid.el b/lisp/avoid.el
index 7969645e03b39f4829df2b528108bfef74b7b1ba..c864d48e9cee12ddeb760c41a609935cd9933fd1 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 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2000-2011 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: mouse
@@ -94,14 +93,14 @@ use either \\[customize] or the function `mouse-avoidance-mode'."
 
 
 (defcustom mouse-avoidance-nudge-dist 15
-  "*Average distance that mouse will be moved when approached by cursor.
+  "Average distance that mouse will be moved when approached by cursor.
 Only applies in Mouse-Avoidance mode `jump' and its derivatives.
 For best results make this larger than `mouse-avoidance-threshold'."
   :type 'integer
   :group 'avoid)
 
 (defcustom mouse-avoidance-nudge-var 10
-  "*Variability of `mouse-avoidance-nudge-dist' (which see)."
+  "Variability of `mouse-avoidance-nudge-dist' (which see)."
   :type 'integer
   :group 'avoid)
 
@@ -111,7 +110,7 @@ For best results make this larger than `mouse-avoidance-threshold'."
   :group 'avoid)
 
 (defcustom mouse-avoidance-threshold 5
-  "*Mouse-pointer's flight distance.
+  "Mouse-pointer's flight distance.
 If the cursor gets closer than this, the mouse pointer will move away.
 Only applies in mouse-avoidance-modes `animate' and `jump'."
   :type 'integer
@@ -278,7 +277,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.
@@ -408,5 +409,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