From 0c895ad0de72a63035ba2ea7da754c3f8407c7a8 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Mon, 24 Feb 2014 08:40:00 +0100
Subject: Fix setting theme for non-daemon Emacs

---
 .emacs.d/init.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.emacs.d/init.el')

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 2783b41..6fd78f6 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -693,7 +693,7 @@ For `python-mode' I prefer `python-imenu-create-flat-index'."
                        (call-interactively func))))))
 
 (let ((theme (if (equal system-name "drd") 'yoshi 'leuven)))
-  (let ((setp (not (daemonp))))
+  (let (setp)
     (defun oni:set-theme (frame)
       "Try to set the theme for the current (first) frame."
       (ignore frame)
@@ -707,7 +707,7 @@ For `python-mode' I prefer `python-imenu-create-flat-index'."
 
   (if (daemonp)
       (add-hook 'after-make-frame-functions #'oni:set-theme)
-    (oni:eval-after-init (oni:set-theme))))
+    (oni:eval-after-init (oni:set-theme nil))))
 
 (defun oni:shell-command-with-command (command &optional output-buffer)
   "Print both COMMAND and the output into OUTPUT-BUFFER."
-- 
cgit v1.2.3-54-g00ecf