diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 312d8351ab6..56a9a08c244 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2000-02-22  Dave Love  <fx@gnu.org>
+
+	* xt-mouse.el: Doc fixes.
+	(xterm-mouse-position-function): New function, replacing advice of
+	mouse-position.
+	(xterm-mouse-mode): Use it.  Don't turn on under a window system.
+
+	* emacs-lisp/cl-indent.el: Remove bogus spec for define-condition.
+
 2000-02-21  Gerd Moellmann  <gerd@gnu.org>
 
 	* format.el (format-annotate-single-property-change): Handle
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 808923ac578..b87061e5316 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -163,7 +163,7 @@ Turn it on to use emacs mouse commands, and off to use xterm mouse commands."
 		  mouse-position-function nil)
 	    (set-buffer-modified-p (buffer-modified-p))))
     ;;Turn it on
-    (unless (or window-systemxterm-mouse-mode)
+    (unless (or window-system xterm-mouse-mode)
       (setq xterm-mouse-mode t
 	    mouse-position-function #'xterm-mouse-position-function)
       (turn-on-xterm-mouse-tracking)