diff options
| author | Eli Zaretskii | 2015-10-21 19:50:10 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2015-10-21 19:50:10 +0300 |
| commit | 5dc48a2da9919f649952e75e54c48fda69a24ac3 (patch) | |
| tree | e47873990418b5ec1f5b45346efab204379ce677 | |
| parent | e5ece3229d7992f4dcaca93d778c7352d1ba775f (diff) | |
| download | emacs-5dc48a2da9919f649952e75e54c48fda69a24ac3.tar.gz emacs-5dc48a2da9919f649952e75e54c48fda69a24ac3.zip | |
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)
| -rw-r--r-- | lisp/server.el | 13 |
1 files 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." | |||
| 1491 | 1491 | ||
| 1492 | (defun server-kill-emacs-query-function () | 1492 | (defun server-kill-emacs-query-function () |
| 1493 | "Ask before exiting Emacs if it has live clients." | 1493 | "Ask before exiting Emacs if it has live clients." |
| 1494 | (or (not server-clients) | 1494 | (or (not (let (live-client) |
| 1495 | (let (live-client) | 1495 | (dolist (proc server-clients) |
| 1496 | (dolist (proc server-clients) | 1496 | (when (memq t (mapcar 'buffer-live-p (process-get |
| 1497 | (when (memq t (mapcar 'buffer-live-p (process-get | 1497 | proc 'buffers))) |
| 1498 | proc 'buffers))) | 1498 | (setq live-client t))) |
| 1499 | (setq live-client t))) | 1499 | live-client)) |
| 1500 | live-client) | ||
| 1501 | (yes-or-no-p "This Emacs session has clients; exit anyway? "))) | 1500 | (yes-or-no-p "This Emacs session has clients; exit anyway? "))) |
| 1502 | 1501 | ||
| 1503 | (defun server-kill-buffer () | 1502 | (defun server-kill-buffer () |