[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master bcf4d96db3a: ; Remove dead code from 'server-stop-automatically--
From: |
Jim Porter |
Subject: |
master bcf4d96db3a: ; Remove dead code from 'server-stop-automatically--handle-delete-frame' |
Date: |
Tue, 6 Dec 2022 17:19:21 -0500 (EST) |
branch: master
commit bcf4d96db3a61e0d02a584fa9fceb049cdad6fe8
Author: Jim Porter <jporterbugs@gmail.com>
Commit: Jim Porter <jporterbugs@gmail.com>
; Remove dead code from 'server-stop-automatically--handle-delete-frame'
* lisp/server.el (server-stop-automatically--handle-delete-frame):
Since 'this-command' is never 'save-buffers-kill-terminal' in this
function, we can remove the second 'if' block and it's then-form,
leaving only the else-form. Additionally, remove the 'delete-frame'
call; it's not necessary, since we just killed Emacs on the prior
line.
---
lisp/server.el | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/lisp/server.el b/lisp/server.el
index 7e713eaecde..aa62b25a891 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1820,26 +1820,10 @@ only these files will be asked to be saved."
(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))))
- (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))))
(defun server-stop-automatically--maybe-kill-emacs ()
"Handle closing of Emacs daemon when `server-stop-automatically' is used."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master bcf4d96db3a: ; Remove dead code from 'server-stop-automatically--handle-delete-frame',
Jim Porter <=