Commits

Anonymous committed 7e27026

Applied Jerry James patch from <tpraesnaumj.fsf@cs.ucsb.edu>
with subject "emacs-minor-version fix for avoid".

  • Participants
  • Parent commits 9955536

Comments (0)

Files changed (2)

+1999-07-23  Jerry James  <jerry@cs.ucsb.edu>
+
+	* avoid.el (mouse-avoidance-exile-hook): Check
+	emacs-major-version too.
+	* avoid.el (mouse-avoidance-fancy-hook): Ditto.
+
 1999-01-29  Christoph Wedler  <wedler@fmi.uni-passau.de>
 
 	* uniquify.el: Sync with Emacs-20.3.
 	      ((and mouse-avoidance-state
 		    (not (mouse-avoidance-too-close-p mouse-avoidance-state)))
 	       ;; XEmacs change
-	       (if (and (eq (car mp) (if (< emacs-minor-version 12)
+	       (if (and (eq (car mp) (if (and (< emacs-major-version 20)
+					      (< emacs-minor-version 12))
 					 (selected-frame)
 				       (selected-window)))
 			(equal (cdr mp) (mouse-avoidance-banish-destination)))
       (let ((old-pos (mouse-position)))
 	(mouse-avoidance-nudge-mouse)
 	;; XEmacs change
-	(if (not (eq (if (< emacs-minor-version 12)
+	(if (not (eq (if (and (< emacs-major-version 20)
+			      (< emacs-minor-version 12))
 			 (selected-frame)
 		       (selected-window)) (car old-pos))) ; move went awry
 	    (set-mouse-position (car old-pos) ; sigh..