diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-09-21 20:19:10 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-09-21 20:19:10 +0000 |
| commit | 23d4cba5c7601c1a3bb3d2c79e535dab8d9adac0 (patch) | |
| tree | 1b638a1e924d8a7af594c2ceb392e3d7932ba645 /lisp | |
| parent | 71f44e7ad49b434c191a84fcd46a7dfa94894735 (diff) | |
| download | emacs-23d4cba5c7601c1a3bb3d2c79e535dab8d9adac0.tar.gz | |
* xt-mouse.el (xterm-mouse-mode): Re-enable suspend-tty-functions.
* term.c (Fsuspend_tty): Run suspend-tty-functions before cleaning
up the tty state.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/xt-mouse.el | 15 |
2 files changed, 8 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ef920fda5bb..d81faec84fb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-09-21 Dan Nicolaescu <dann@ics.uci.edu> + + * xt-mouse.el (xterm-mouse-mode): Re-enable suspend-tty-functions. + 2007-09-21 Juanma Barranquero <lekktu@gmail.com> * frame.el (suspend-frame): Call `iconify-or-deiconify-frame' also diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el index 49f1886f878..15aebb08ab2 100644 --- a/lisp/xt-mouse.el +++ b/lisp/xt-mouse.el @@ -214,15 +214,8 @@ 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. - - ;; 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 '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) @@ -234,8 +227,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) |