From cf31d2605f0132cd16adf68bf8238dcfe90ccd30 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 6 Mar 2021 00:07:12 -0500 Subject: [PATCH] app/calendar: fix edge case with +calendar/quit The user can open the calendar directly, with `M-x cfw:open-calendar-buffer`, which sidesteps the workspace init logic in =calendar. This fixes +calendar/quit so it can deal with this use case. Mentioned in #4019 --- modules/app/calendar/autoload.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/app/calendar/autoload.el b/modules/app/calendar/autoload.el index 40e239ece..bb446931e 100644 --- a/modules/app/calendar/autoload.el +++ b/modules/app/calendar/autoload.el @@ -29,11 +29,12 @@ "TODO" (interactive) (if (featurep! :ui workspaces) - (+workspace/delete "Calendar") - (doom-kill-matching-buffers "^\\*cfw:") + (when (+workspace-exists-p "Calendar") + (+workspace/delete "Calendar")) (when (window-configuration-p +calendar--wconf) (set-window-configuration +calendar--wconf)) - (setq +calendar--wconf nil))) + (setq +calendar--wconf nil)) + (doom-kill-matching-buffers "^\\*cfw[:-]")) ;;;###autoload (defun +calendar/open-calendar ()