diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-09-17 06:54:23 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-09-17 06:54:23 +0000 |
| commit | 9f596249ba1cbdf2f2b315b27acdda99bfd10be5 (patch) | |
| tree | feb4a0a0fd66119c2f596721c0abb60c3ec4d0f1 /lisp | |
| parent | b9451e853868f48f6b495d200fd134a9b31eee58 (diff) | |
| download | emacs-9f596249ba1cbdf2f2b315b27acdda99bfd10be5.tar.gz | |
Delete add-hook calls that were moved to
xterm-mouse-mode.
(xterm-mouse-mode): Disable resume-tty-functions, explain why it
does not work.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/xt-mouse.el | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4c5d7aabd63..596d972932b 100644 --- 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 ff15cad0399..49f1886f878 100644 --- 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) |