From 5dc48a2da9919f649952e75e54c48fda69a24ac3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 21 Oct 2015 19:50:10 +0300 Subject: [PATCH] Fix logic in 'server-kill-emacs-query-function' * lisp/server.el (server-kill-emacs-query-function): Correct the logic that controls whether the user is asked for confirmation. (Bug#21723) --- lisp/server.el | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lisp/server.el b/lisp/server.el index 5a67f12072b..59fd973115b 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1491,13 +1491,12 @@ specifically for the clients and did not exist before their request for it." (defun server-kill-emacs-query-function () "Ask before exiting Emacs if it has live clients." - (or (not server-clients) - (let (live-client) - (dolist (proc server-clients) - (when (memq t (mapcar 'buffer-live-p (process-get - proc 'buffers))) - (setq live-client t))) - live-client) + (or (not (let (live-client) + (dolist (proc server-clients) + (when (memq t (mapcar 'buffer-live-p (process-get + proc 'buffers))) + (setq live-client t))) + live-client)) (yes-or-no-p "This Emacs session has clients; exit anyway? "))) (defun server-kill-buffer () -- 2.39.2