Commit 2675c79d authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix daemon shutdown when emacs-kill-hooks ask questions

* lisp/server.el (server-start): Put the server's kill-emacs-hook
last, to allow other hooks to have a frame to interact with the
user.  (Bug#24326)
parent 6d6d9cd6
......@@ -648,7 +648,12 @@ server or call `\\[server-force-delete]' to forcibly disconnect it."))
(add-hook 'delete-frame-functions 'server-handle-delete-frame)
(add-hook 'kill-emacs-query-functions
(add-hook 'kill-emacs-hook 'server-force-stop) ;Cleanup upon exit.
;; We put server's kill-emacs-hook after the others, so that
;; frames are not deleted too early, because doing that
;; would severely degrade our abilities to communicate with
;; the user, while some hooks may wish to ask the user
;; questions (e.g., desktop-kill).
(add-hook 'kill-emacs-hook 'server-force-stop t) ;Cleanup upon exit.
(setq server-process
(apply #'make-network-process
:name server-name
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment