From 9c3bcfcdc50450c10f56f401e919059b45fed0cb Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 21 Jul 2015 16:51:57 -0700
Subject: [PATCH] edit server works again.

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

diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 0c4dd680..3fea643d 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -670,10 +670,11 @@ The current directory is assumed to be the project's root otherwise."
 (use-package edit-server
   :ensure t
   :commands edit-server-start
+  :defer 1
   :config
   (progn
-    (setq edit-server-new-frame nil)
-    (edit-server-start)))
+    (edit-server-start)
+    (setq edit-server-new-frame nil)))
 
 (use-package jabber
   :ensure t