From a79b4f34faf2c0bd30f8d66f87e4d84832477371 Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Thu, 1 Dec 2022 12:23:17 -0800 Subject: [PATCH 7/7] Simplify 'server-stop-automatically--handle-delete-frame' * lisp/server.el (server-stop-automatically--handle-delete-frame): Combine the 'when' and 'if' into a single conditional. --- lisp/server.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/server.el b/lisp/server.el index 6eeaa932a7..e88cffa8fb 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1818,11 +1818,11 @@ server-save-buffers-kill-terminal (defun server-stop-automatically--handle-delete-frame (frame) "Handle deletion of FRAME when `server-stop-automatically' is used." - (when server-stop-automatically - (if (null (cddr (frame-list))) - (let ((server-stop-automatically nil)) - (save-buffers-kill-emacs) - (delete-frame frame))))) + (when (and server-stop-automatically + (null (cddr (frame-list)))) + (let ((server-stop-automatically nil)) + (save-buffers-kill-emacs) + (delete-frame frame)))) (defun server-stop-automatically--maybe-kill-emacs () "Handle closing of Emacs daemon when `server-stop-automatically' is used." -- 2.25.1