Merge remote-tracking branch 'upstream/develop' into develop

core/core-packages.el

@@ -522,10 +522,10 @@ happen if you manually modify/update/install packages from outside Emacs, while
 an Emacs session is running.
 
 This isn't necessary if you use Doom's package management commands because they
-call `doom/reload-load-path' remotely (through emacsclient)."
+call `doom//reload-load-path' remotely (through emacsclient)."
   (interactive)
   (byte-recompile-file (expand-file-name "core.el" doom-core-dir) t)
-  (cond (noninteractive
+  (cond ((and noninteractive (not (daemonp)))
          (require 'server)
          (when (server-running-p)
            (message "Reloading active Emacs session...")

modules/feature/workspaces/autoload/workspaces.el

@@ -289,6 +289,13 @@ workspace to delete."
   (switch-to-buffer (doom-fallback-buffer))
   (doom/cleanup-session))
 
+;;;###autoload
+(defun +workspace/kill-session-and-quit ()
+  "Kill emacs without saving anything."
+  (interactive)
+  (let ((persp-auto-save-opt 0))
+    (kill-emacs)))
+
 ;;;###autoload
 (defun +workspace/new (&optional name clone-p)
   "Create a new workspace named NAME. If CLONE-P is non-nil, clone the current