From 024576a09aec23f96807df26b88db6f090e9c220 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 10 Jul 2014 19:20:32 +0100
Subject: Emacs: workaround ws-butler daemon issue

lewang/ws-butler#4
---
 tag-emacs/emacs.d/init.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el
index aa78e33..228adeb 100644
--- a/tag-emacs/emacs.d/init.el
+++ b/tag-emacs/emacs.d/init.el
@@ -329,7 +329,10 @@
         (message "File '%s' successfully removed" filename)))))
 
 (req-package ws-butler
+  :if window-system
   :config (ws-butler-global-mode 1))
+(if (daemonp)
+    (add-hook #'before-make-frame-hook (lambda () (ws-butler-global-mode 1))))
 
 (req-package fasd
   :bind ("C-x C-/" . fasd-find-file)
-- 
cgit 1.4.1