summary refs log tree commit diff
path: root/emacs
diff options
context:
space:
mode:
authornoa2025-02-16 21:51:34 +0800
committernoa2025-02-16 21:51:34 +0800
commiteda24700293d6132ec338d5a060418e6ad333677 (patch)
treefdd22a0e225347bde8130c81b886df55c775571a /emacs
parentc97f770cf68a8ef374dac7f756d62b3aece2d07f (diff)
Add ediff config
Diffstat (limited to 'emacs')
-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