app/calendar: don't require :feature workspaces

modules/app/calendar/autoload.el

@@ -1,24 +1,36 @@
 ;;; app/calendar/autoload.el -*- lexical-binding: t; -*-
 
+(defvar +calendar--wconf nil)
+
+(defun +calendar--init ()
+  (if-let* ((win (cl-loop for win in (doom-visible-windows)
+                          if (string-match-p "^\\*cfw:" (buffer-name (window-buffer it)))
+                          return win)))
+      (select-window win)
+    (call-interactively +calendar-open-function)))
+
 ;;;###autoload
 (defun =calendar ()
   "Activate (or switch to) `calendar' in its workspace."
   (interactive)
-  (unless (featurep! :feature workspaces)
+  (if (featurep! :feature workspaces)
-    (user-error ":feature workspaces is required, but disabled"))
+      (progn
-  (+workspace-switch "Calendar" t)
+        (+workspace-switch "Calendar" t)
-  (if-let* ((win (cl-loop for win in (doom-visible-windows)
+        (+calendar--init)
-                          if (string-match-p "^\\*cfw" (buffer-name (window-buffer it)))
+        (+workspace/display))
-                          return win)))
+    (setq +calendar--wconf (current-window-configuration))
-      (select-window win)
+    (delete-other-windows)
-    (call-interactively +calendar-open-function))
+    (+calendar--init)))
-  (+workspace/display))
 
 ;;;###autoload
 (defun +calendar/quit ()
   "TODO"
   (interactive)
-  (+workspace/delete "Calendar"))
+  (if (featurep! :feature workspaces)
+      (+workspace/delete "Calendar")
+    (doom-kill-matching-buffers "^\\*cfw:")
+    (set-window-configuration +calendar--wconf)
+    (setq +calendar--wconf nil)))
 
 ;;;###autoload
 (defun +calendar/open-calendar ()