From ead70ce0060c1efb815f9f099d6e98c26523971d Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Fri, 31 Oct 2014 23:21:51 -0400
Subject: Don't use new frame for Ediff control panel

---
 lisp/init-external.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lisp/init-external.el b/lisp/init-external.el
index baad4ef..9732b58 100644
--- a/lisp/init-external.el
+++ b/lisp/init-external.el
@@ -97,6 +97,8 @@ monitor setup)."
   (revert-buffer)
   (view-mode 1))
 
+(setq ediff-window-setup-function 'ediff-setup-windows-plain)
+
 (define-key km/external-map "d" 'diff)
 (define-key km/external-map "e" 'ediff)
 (after 'diff
-- 
cgit v1.2.3