From e6fd13de4a85e8380754d32e8a76ce0ff2f474f6 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 29 Oct 2007 00:44:52 +0000 Subject: [PATCH] (server-unload-function): Rename from `server-unload-hook' and adapt to new `unload-feature' functionality. Remove hook from `kill-buffer-hook' buffer-locally. (server-unload-hook): Remove. (server-unload-function): New var; replaces `server-unload-hook'. --- lisp/ChangeLog | 11 +++++++++++ lisp/server.el | 14 +++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0f68b6cafbb..87ecb538357 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2007-10-29 Juanma Barranquero + + * loadhist.el (unload-feature-special-hooks): + Add `delete-frame-functions'. + + * server.el (server-unload-function): Rename from `server-unload-hook' + and adapt to new `unload-feature' functionality. Remove hook from + `kill-buffer-hook' buffer-locally. + (server-unload-hook): Remove. + (server-unload-function): New var; replaces `server-unload-hook'. + 2007-10-27 Juanma Barranquero * desktop.el (uniquify-managed): Pacify byte compiler. diff --git a/lisp/server.el b/lisp/server.el index 8eb9dbb685e..6af9b9952d6 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -764,14 +764,18 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it." (define-key ctl-x-map "#" 'server-edit) -(defun server-unload-hook () +(defun server-unload-function () + "Unload the server library." (server-mode -1) - (remove-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function) - (remove-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function) - (remove-hook 'kill-buffer-hook 'server-kill-buffer)) + (save-current-buffer + (dolist (buffer (buffer-list)) + (set-buffer buffer) + (remove-hook 'kill-buffer-hook 'server-kill-buffer t))) + ;; continue standard unloading + nil) (add-hook 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup upon exit. -(add-hook 'server-unload-hook 'server-unload-hook) +(defvar server-unload-function 'server-unload-function) (provide 'server) -- 2.39.2