+2001-07-24 Eli Zaretskii <eliz@is.elta.co.il>
+
+ * avoid.el (mouse-avoidance-too-close-p): If the frame lacks a
+ tool-bar-lines parameter, behave as if its value were zero.
+ (mouse-avoidance-set-pointer-shape): Don't do anything if
+ x-pointer-shape is not boundp.
+
2001-07-23 Francesco Potorti` <pot@gnu.org>
* uniquify.el: Overall speedup changes when using many buffers.
(defsubst mouse-avoidance-set-pointer-shape (shape)
"Set the shape of the mouse pointer to SHAPE."
- (setq x-pointer-shape shape)
- (set-mouse-color nil))
+ (when (boundp 'x-pointer-shape)
+ (setq x-pointer-shape shape)
+ (set-mouse-color nil)))
(defun mouse-avoidance-point-position ()
"Return the position of point as (FRAME X . Y).
(let* ((frame (car mouse))
(mouse-y (cdr (cdr mouse)))
(tool-bar-lines (frame-parameter nil 'tool-bar-lines)))
+ (or tool-bar-lines
+ (setq tool-bar-lines 0))
(if (and mouse-y (< mouse-y tool-bar-lines))
nil
(let ((point (mouse-avoidance-point-position))
(run-with-idle-timer 0.1 t 'mouse-avoidance-fancy-hook))
(setq mouse-avoidance-mode mode
mouse-avoidance-state (cons 0 0)
- mouse-avoidance-old-pointer-shape x-pointer-shape))
+ mouse-avoidance-old-pointer-shape
+ (and (boundp 'x-pointer-shape) x-pointer-shape)))
((eq mode 'exile)
(setq mouse-avoidance-timer
(run-with-idle-timer 0.1 t 'mouse-avoidance-exile-hook))