diff --git a/init.el b/init.el index 1153af1..e5907c2 100644 --- a/init.el +++ b/init.el @@ -38,6 +38,7 @@ (add-to-list 'load-path (file-name-concat config-directory "conf-mode")) (add-to-list 'load-path (file-name-concat config-directory "dired")) (add-to-list 'load-path (file-name-concat config-directory "display-buffer")) + (add-to-list 'load-path (file-name-concat config-directory "ediff")) (add-to-list 'load-path (file-name-concat config-directory "eglot")) (add-to-list 'load-path (file-name-concat config-directory "eldoc")) (add-to-list 'load-path (file-name-concat config-directory "electric")) @@ -62,6 +63,7 @@ (require 'init-prog-mode) (require 'init-dired) (require 'init-display-buffer) +(require 'init-ediff) (require 'init-eldoc) (require 'init-electric) (require 'init-flymake) diff --git a/init/ediff/init-ediff.el b/init/ediff/init-ediff.el new file mode 100644 index 0000000..01a02b2 --- /dev/null +++ b/init/ediff/init-ediff.el @@ -0,0 +1,4 @@ +(setq ediff-split-window-function 'split-window-horizontally + ediff-window-setup-function 'ediff-setup-windows-plain) + +(provide 'init-ediff)