diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/server.el | 4 | ||||
| -rw-r--r-- | lisp/xt-mouse.el | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4326ba221e0..6be6537c067 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2007-09-04 Dan Nicolaescu <dann@ics.uci.edu> + + * server.el (server-start, server-unload-hook): + suspend-tty-functions has been renamed to suspend-tty-hook. + + * xt-mouse.el: Likewise. resume-tty-functions has been renamed to + resume-tty-hook. + 2007-09-03 Emanuele Giaquinta <e.giaquinta@glauco.it> (tiny change) * loadup.el: Fix merge problem, only load "button" once. diff --git a/lisp/server.el b/lisp/server.el index be271051095..44dbb8484a9 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -485,7 +485,7 @@ kill any existing server communications subprocess." (when server-process (server-log (message "Restarting server"))) (letf (((default-file-modes) ?\700)) - (add-hook 'suspend-tty-functions 'server-handle-suspend-tty) + (add-hook 'suspend-tty-hook 'server-handle-suspend-tty) (add-hook 'delete-frame-functions 'server-handle-delete-frame) (add-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function) (add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) @@ -1225,7 +1225,7 @@ only these files will be asked to be saved." (defun server-unload-hook () "Unload the server library." (server-mode -1) - (remove-hook 'suspend-tty-functions 'server-handle-suspend-tty) + (remove-hook 'suspend-tty-hook 'server-handle-suspend-tty) (remove-hook 'delete-frame-functions 'server-handle-delete-frame) (remove-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function) (remove-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el index af7a3789df0..9a2603d57c8 100644 --- a/lisp/xt-mouse.el +++ b/lisp/xt-mouse.el @@ -251,8 +251,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. -(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-tty-hook 'turn-off-xterm-mouse-tracking-on-terminal) +(add-hook 'resume-tty-hook 'turn-on-xterm-mouse-tracking-on-terminal) (add-hook 'suspend-hook 'turn-off-xterm-mouse-tracking) (add-hook 'suspend-resume-hook 'turn-on-xterm-mouse-tracking) (add-hook 'kill-emacs-hook 'turn-off-xterm-mouse-tracking) |