From f35a49dc7eadcd262e3c2cee69dfbbe060047480 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 7 Feb 2018 19:27:41 -0500 Subject: [PATCH 1/2] feature/workspaces: redefine +workspace/kill-session-and-quit --- modules/feature/workspaces/autoload/workspaces.el | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/feature/workspaces/autoload/workspaces.el b/modules/feature/workspaces/autoload/workspaces.el index 8d71d4f2f..228f0467d 100644 --- a/modules/feature/workspaces/autoload/workspaces.el +++ b/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 From 33553784805b0a543eb92ccaef68c560a229be4d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 8 Feb 2018 02:15:41 -0500 Subject: [PATCH 2/2] Fix doom//reload-load-path infinite recursion with daemon emacs --- core/core-packages.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index 53e6354bf..be58198db 100644 --- a/core/core-packages.el +++ b/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...")