about summary refs log tree commit diff
path: root/users/sterni/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'users/sterni/emacs')
-rw-r--r--users/sterni/emacs/init.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/users/sterni/emacs/init.el b/users/sterni/emacs/init.el
index e04ed724bfdb..80ea16d42901 100644
--- a/users/sterni/emacs/init.el
+++ b/users/sterni/emacs/init.el
@@ -107,6 +107,10 @@
         org-default-notes-file (concat org-folder "/inbox.org")
         initial-buffer-choice org-default-notes-file))
 
+;; ediff
+; doesn't create new window for ediff controls which I always open accidentally
+(setq ediff-window-setup-function 'ediff-setup-windows-plain)
+
 ;;; Configure packages
 (require 'use-package)