summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emacs/init.el6
1 files changed, 6 insertions, 0 deletions
diff --git a/emacs/init.el b/emacs/init.el
index eed51ba..bcfd7a0 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -925,6 +925,12 @@ necessary variables are set."
:mode ((rx (or ".lisp" ".cl") eos) . common-lisp-mode))
+(use-package ediff
+ :defer t
+ :custom
+ (ediff-window-setup-function 'ediff-setup-windows-plain)
+ (ediff-split-window-function 'split-window-horizontally))
+
(use-package proced
:defer t
:custom