From be0b4556b9cb1ab882d7e6ce5e85dd20cfdc9d96 Mon Sep 17 00:00:00 2001 From: Jim Porter Date: Thu, 1 Dec 2022 11:35:00 -0800 Subject: [PATCH 2/7] Simplify server-stop-automatically handlers * lisp/server.el (server-stop-automatically--handle-delete-frame): 'this-command' is never 'save-buffers-kill-terminal' here; remove the whole conditional. (server-stop-automatically--handle-kill-terminal): 'this-command' is always 'save-buffers-kill-terminal', so remove that test. --- lisp/server.el | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/lisp/server.el b/lisp/server.el index 0a59c8496a..64332442d3 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1807,22 +1807,7 @@ 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 (if (and (processp (frame-parameter frame 'client)) - (eq this-command 'save-buffers-kill-terminal)) - (progn - (dolist (f (frame-list)) - (when (and (eq (frame-parameter frame 'client) - (frame-parameter f 'client)) - (not (eq frame f))) - (set-frame-parameter f 'client nil) - (let ((server-stop-automatically nil)) - (delete-frame f)))) - (if (cddr (frame-list)) - (let ((server-stop-automatically nil)) - (delete-frame frame) - nil) - t)) - (null (cddr (frame-list)))) + (if (null (cddr (frame-list))) (let ((server-stop-automatically nil)) (save-buffers-kill-emacs) (delete-frame frame))))) @@ -1830,8 +1815,7 @@ server-stop-automatically--handle-delete-frame (defun server-stop-automatically--handle-kill-terminal (frame) "Handle deletion of FRAME when `server-stop-automatically' is used." (when server-stop-automatically - (if (if (and (processp (frame-parameter frame 'client)) - (eq this-command 'save-buffers-kill-terminal)) + (if (if (processp (frame-parameter frame 'client)) (progn (dolist (f (frame-list)) (when (and (eq (frame-parameter frame 'client) -- 2.25.1