(turn-on-xterm-mouse-tracking-on-terminal)

(turn-off-xterm-mouse-tracking-on-terminal): Do not turn on the
mode on the initial terminal.

2 files changed, 14 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2ac853364f..d1eec646ea2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-05  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
+        (turn-off-xterm-mouse-tracking-on-terminal): Do not turn on the
+        mode on the initial terminal.
+
 2009-02-05  Nick Roberts  <nickrob@snap.net.nz>
 
         * vc-dir.el (vc-dir-find-file-other-window): Allow mouse events.
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index f59ef8f7b65..86c28fa4734 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -236,7 +236,10 @@ down the SHIFT key while pressing the mouse button."
 
 (defun turn-on-xterm-mouse-tracking-on-terminal (&optional terminal)
   "Enable xterm mouse tracking on TERMINAL."
-  (when (and xterm-mouse-mode (eq t (terminal-live-p terminal)))
+  (when (and xterm-mouse-mode (eq t (terminal-live-p terminal))
+             ;; Avoid the initial terminal which is not a termcap device.
+             ;; FIXME: is there more elegant way to detect the initial terminal?
+             (not (string= (terminal-name terminal) "initial_terminal")))
     (unless (terminal-parameter terminal 'xterm-mouse-mode)
       ;; Simulate selecting a terminal by selecting one of its frames ;-(
       (with-selected-frame (car (frames-on-display-list terminal))
@@ -249,7 +252,10 @@ down the SHIFT key while pressing the mouse button."
   ;; Only send the disable command to those terminals to which we've already
   ;; sent the enable command.
   (when (and (terminal-parameter terminal 'xterm-mouse-mode)
-             (eq t (terminal-live-p terminal)))
+             (eq t (terminal-live-p terminal))
+             ;; Avoid the initial terminal which is not a termcap device.
+             ;; FIXME: is there more elegant way to detect the initial terminal?
+             (not (string= (terminal-name terminal) "initial_terminal")))
     ;; We could remove the key-binding and unset the `xterm-mouse-mode'
     ;; terminal parameter, but it seems less harmful to send this escape
     ;; command too many times (or to catch an unintended key sequence), than