diff options
| author | John Turner <jturner.usa@gmail.com> | 2022-10-10 23:51:16 -0400 |
|---|---|---|
| committer | John Turner <jturner.usa@gmail.com> | 2022-10-10 23:51:16 -0400 |
| commit | 5acbae002788e3bade07c95db96ee8ea99fe07e9 (patch) | |
| tree | 2b60e43f72b86f6232fbb6d83e614b856e5f9593 | |
| parent | c3bf99ad1b59ba04de3a8bd3503827d38e2bef5e (diff) | |
| download | emacs.d-5acbae002788e3bade07c95db96ee8ea99fe07e9.tar.gz | |
added an ediff init module
| -rw-r--r-- | init.el | 2 | ||||
| -rw-r--r-- | init/ediff/init-ediff.el | 4 |
2 files changed, 6 insertions, 0 deletions
@@ -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) |