Delete add-hook calls that were moved to

xterm-mouse-mode.
(xterm-mouse-mode): Disable resume-tty-functions, explain why it
does not work.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c5d7aabd63f7c9c243f7130e5e85ff36068c898..596d972932b1bdc536fe517246307a268ef08219 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
        * xt-mouse.el: Delete add-hook calls that were moved to
        xterm-mouse-mode.
+       (xterm-mouse-mode): Disable resume-tty-functions, explain why it
+       does not work.
 
 2007-09-17  Richard Stallman  <rms@gnu.org>
 

diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index ff15cad03999d1312de15620812beda05501ba10..49f1886f8784b6f06154f39b18c7a8785b4740ef 100644 (file)
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -214,8 +214,15 @@ down the SHIFT key while pressing the mouse button."
        (add-hook 'delete-frame-functions 'xterm-mouse-handle-delete-frame)
        
        ;; Restore normal mouse behaviour outside Emacs.
-       (add-hook 'suspend-tty-functions 
-                 'turn-off-xterm-mouse-tracking-on-terminal)
+       
+       ;; Temporarily disable this hook, it does not work, when
+       ;; `suspend-tty' calls `suspend-tty-functions' the tty->output
+       ;; is already set to 0 so the 'send-string-to-terminal' call
+       ;; in `turn-off-xterm-mouse-tracking-on-terminal' will result
+       ;; in a crash.
+        ;; (add-hook 'suspend-tty-functions
+       ;;   'turn-off-xterm-mouse-tracking-on-terminal)
+
        (add-hook 'resume-tty-functions 
                  'turn-on-xterm-mouse-tracking-on-terminal)
        (add-hook 'suspend-hook 'turn-off-xterm-mouse-tracking)
@@ -227,8 +234,8 @@ down the SHIFT key while pressing the mouse button."
     (remove-hook 'after-make-frame-functions 
                 'turn-on-xterm-mouse-tracking-on-terminal)
     (remove-hook 'delete-frame-functions 'xterm-mouse-handle-delete-frame)
-    (remove-hook 'suspend-tty-functions 
-                'turn-off-xterm-mouse-tracking-on-terminal)
+    ;; (remove-hook 'suspend-tty-functions 
+    ;;          'turn-off-xterm-mouse-tracking-on-terminal)
     (remove-hook 'resume-tty-functions 
                 'turn-on-xterm-mouse-tracking-on-terminal)
     (remove-hook 'suspend-hook 'turn-off-xterm-mouse-tracking)