* xt-mouse.el (xterm-mouse-mode): Add hooks here not at the top

level.  Remove the hooks when turning off the mode.

* term/xterm.el: Require xt-mouse at compile time.
(terminal-init-xterm): Turn on xterm mouse tracking for this
terminal if xterm-mouse-mode is enabled.

1 files changed, 7 insertions, 1 deletions

diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 8e803a4534b..de206c159c7 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -27,6 +27,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'xt-mouse))
+
 (defvar xterm-function-map
   (let ((map (make-sparse-keymap)))
 
@@ -455,7 +457,11 @@
     (xterm-register-default-colors)
     ;; This recomputes all the default faces given the colors we've just set up.
     (tty-set-up-initial-frame-faces)
-
+    
+    (when xterm-mouse-mode
+      (turn-on-xterm-mouse-tracking-on-terminal 
+       (frame-terminal (selected-frame))))
+    
     ;; Try to turn on the modifyOtherKeys feature on modern xterms.
     ;; When it is turned on much more key bindings work: things like
     ;; C-. C-, etc.