(ebrowse-tree-mode-map): Use display-mouse-p instead of window-system.

[gnu-emacs] / lisp / avoid.el

diff --git a/lisp/avoid.el b/lisp/avoid.el
index 4f2039fc000fd3f518c4f4dd7ca67b4afeb1d273..f5712427964bff363d2040d295c8f9c375d85744 100644 (file)
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -30,7 +30,7 @@
 ;; To use, load or evaluate this file and type M-x mouse-avoidance-mode .
 ;; To set up permanently, put the following in your .emacs: 
 ;;
-;; (if window-system (mouse-avoidance-mode 'animate))
+;; (if (display-mouse-p) (mouse-avoidance-mode 'animate))
 ;;
 ;; Other legitimate alternatives include
 ;; `banish', `exile', `jump', `cat-and-mouse', and `proteus'.
@@ -41,7 +41,7 @@
 ;; For added silliness, make the animatee animate...
 ;; put something similar to the following into your .emacs:
 ;;
-;; (if window-system
+;; (if (eq window-system 'x)
 ;;     (mouse-avoidance-set-pointer-shape
 ;;          (eval (nth (random 4)
 ;;                     '(x-pointer-man x-pointer-spider
@@ -257,9 +257,9 @@ redefine this function to suit your own tastes."
   (if (null mouse-avoidance-pointer-shapes)
       (progn
        (setq mouse-avoidance-pointer-shapes
-             (mapcar '(lambda (x) (symbol-value (intern x)))
+             (mapcar (lambda (x) (symbol-value (intern x)))
                      (all-completions "x-pointer-" obarray
-                                      '(lambda (x) 
+                                      (lambda (x) 
                                          (and (boundp x)
                                               (integerp (symbol-value x)))))))
        (setq mouse-avoidance-n-pointer-shapes