From 3aeb0c060f2d600aa1548712f6484c18a8f947a2 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 9 Jul 2021 18:01:02 -0400 Subject: [PATCH] Fix #5195: workspace is killed on magit commit Due to magit now using server-done instead of server-edit as of magit/magit@5c02910, which calls server-done-hook, which the workspaces module has a hook on to kill auto-generated, daemon-spawned frames, causing workspaces to be prematurely killed when commiting in magit. --- modules/ui/workspaces/autoload/workspaces.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ui/workspaces/autoload/workspaces.el b/modules/ui/workspaces/autoload/workspaces.el index 1beabbb60..c9407e1e3 100644 --- a/modules/ui/workspaces/autoload/workspaces.el +++ b/modules/ui/workspaces/autoload/workspaces.el @@ -490,7 +490,7 @@ the next." "Delete workspace associated with current frame. A workspace gets associated with a frame when a new frame is interactively created." - (when persp-mode + (when (and persp-mode (not (bound-and-true-p with-editor-mode))) (unless frame (setq frame (selected-frame))) (let ((frame-persp (frame-parameter frame 'workspace)))