From c4f3b4e524a79026898294ed637729c0236b94c0 Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Wed, 7 Dec 2011 12:47:27 +0100
Subject: [PATCH] fix ediff unnecessary frame

---
 modules/prelude-editor.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/prelude-editor.el b/modules/prelude-editor.el
index 992070a..aa93ad3 100644
--- a/modules/prelude-editor.el
+++ b/modules/prelude-editor.el
@@ -175,6 +175,9 @@
 ;; dired - reuse current buffer by pressing 'a'
 (put 'dired-find-alternate-file 'disabled nil)
 
+;; ediff - don't start another frame
+(setq ediff-window-setup-function 'ediff-setup-windows-plain)
+
 (provide 'prelude-editor)
 
 ;;; prelude-editor.el ends here