From 694aad432aee73acd2335f5ea5d0f47d0c8379e2 Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Thu, 1 Dec 2022 11:48:11 -0800 Subject: [PATCH 4/7] Remove unnecessary 'delete-frame' calls after 'save-buffers-kill-emacs' No need to delete a frame if we're killing Emacs entirely anyway. * lisp/server.el (server-stop-automatically--handle-kill-terminal): Remove a couple 'delete-frame' calls. --- lisp/server.el | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lisp/server.el b/lisp/server.el index 7191387959..399bf694fd 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1818,9 +1818,7 @@ server-stop-automatically--handle-kill-terminal (let ((proc (frame-parameter frame 'client))) (cond ((eq proc 'nowait) (if (null (cddr (frame-list))) - (let ((server-stop-automatically nil)) - (save-buffers-kill-emacs) - (delete-frame frame)))) + (save-buffers-kill-emacs))) ((processp proc) (if (progn (dolist (f (frame-list)) @@ -1835,9 +1833,7 @@ server-stop-automatically--handle-kill-terminal (delete-frame frame) nil) t)) - (let ((server-stop-automatically nil)) - (save-buffers-kill-emacs) - (delete-frame frame)))))))) + (save-buffers-kill-emacs))))))) (defun server-stop-automatically--maybe-kill-emacs () "Handle closing of Emacs daemon when `server-stop-automatically' is used." -- 2.25.1