Mercurial > emacs

changeset 85417:88baf5c3a196

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't require xt-mouse. (terminal-init-xterm): Run terminal-init-xterm-hook rather than calling turn-on-xterm-mouse-tracking-on-terminal directly.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 18 Oct 2007 19:07:49 +0000
parents 58c70d072b21
children 26dcc1207f42
files lisp/ChangeLog lisp/term/xterm.el
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Oct 18 19:06:44 2007 +0000
+++ b/lisp/ChangeLog	Thu Oct 18 19:07:49 2007 +0000
@@ -1,5 +1,9 @@
 2007-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* term/xterm.el: Don't require xt-mouse.
+	(terminal-init-xterm): Run terminal-init-xterm-hook rather than
+	calling turn-on-xterm-mouse-tracking-on-terminal directly.
+
 	* xt-mouse.el: Don't change the global function-key-map anny more.
 	(xterm-mouse-mode): Use terminal-init-xterm-hook.
 	Don't use after-make-frame-functions now that term/xterm.el calls
--- a/lisp/term/xterm.el	Thu Oct 18 19:06:44 2007 +0000
+++ b/lisp/term/xterm.el	Thu Oct 18 19:07:49 2007 +0000
@@ -27,8 +27,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'xt-mouse))
-
 (defvar xterm-function-map
   (let ((map (make-sparse-keymap)))
 
@@ -469,12 +467,8 @@
     ;; 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
+    ;; When it is turned on many more key bindings work: things like
     ;; C-. C-, etc.
     ;; To do that we need to find out if the current terminal supports
     ;; modifyOtherKeys. At this time only xterm does.
@@ -506,7 +500,9 @@
 	      ;; need to deal with modify-other-keys.
 	      (push (frame-terminal (selected-frame))
 		    xterm-modify-other-keys-terminal-list)
-	      (xterm-turn-on-modify-other-keys)))))))
+	      (xterm-turn-on-modify-other-keys))))))
+
+    (run-hooks 'terminal-init-xterm-hook))
 
 ;; Set up colors, for those versions of xterm that support it.
 (defvar xterm-standard-colors