From 67317ec7e233239474f42819a83d8493e32a1a0d Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sat, 20 Dec 2014 01:20:54 -0800
Subject: [PATCH] Disable frames in edit-server

---
 init.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/init.el b/init.el
index ffdaa7dc..84e29a81 100644
--- a/init.el
+++ b/init.el
@@ -568,7 +568,10 @@ The current directory is assumed to be the project's root otherwise."
 (use-package edit-server
   :ensure t
   :commands edit-server-start
-  :idle (edit-server-start))
+  :idle (edit-server-start)
+  :config
+  (progn
+    (setq edit-server-new-frame nil)))
 
 (use-package jabber
   :ensure t