From 834e92c46538305837f962ad3210496f996cb975 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 30 Jan 2018 16:17:46 -0500 Subject: [PATCH] feature/workspaces: fix hash-table-p error on startup in daemon Emacs Because persp-mode initializes differently (and later) in daemon/noninteractive Emacs, +workspaces|init would fail while trying to use persp-mode features in a broken state. --- modules/feature/workspaces/config.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/feature/workspaces/config.el b/modules/feature/workspaces/config.el index 8e6e6d04a..7c30f758e 100644 --- a/modules/feature/workspaces/config.el +++ b/modules/feature/workspaces/config.el @@ -25,12 +25,14 @@ renamed.") :defer t :init (defun +workspaces|init () + (add-hook 'after-make-frame-functions #'+workspaces|init-frame) (require 'persp-mode) - (persp-mode +1) - (+workspaces|init-frame (selected-frame)) - (add-hook 'after-make-frame-functions #'+workspaces|init-frame)) + (unless (daemonp) + (+workspaces|init-frame (selected-frame)))) (defun +workspaces|init-frame (frame) + (unless persp-mode + (persp-mode +1)) (unless noninteractive (let (persp-before-switch-functions persp-activated-functions) (with-selected-frame frame