From 25ba6d7f7814ffc345e943535e834e616d9b4746 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 18 Jan 2015 04:55:03 -0800 Subject: [PATCH] ediff in same frame. --- dotfiles/emacs.d/init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el index b408ffab..06a34590 100644 --- a/dotfiles/emacs.d/init.el +++ b/dotfiles/emacs.d/init.el @@ -360,6 +360,7 @@ The current directory is assumed to be the project's root otherwise." (setq reb-re-syntax 'string) (setq ediff-split-window-function 'split-window-horizontally) +(setq ediff-window-setup-function 'ediff-setup-windows-plain) ;; ============================================================================= ;; use-package