diff options
| author | Kjetil Orbekk <kj@orbekk.com> | 2022-09-29 14:21:17 -0700 |
|---|---|---|
| committer | Kjetil Orbekk <kj@orbekk.com> | 2022-09-29 14:21:17 -0700 |
| commit | 4100562febcfbfc66862c185035fd0ba67beb8ac (patch) | |
| tree | de217e2d027f437595db425c5b9a053b99407365 /emacs | |
| parent | 2da2078c9c25cc4b067c0d6e046e28f0d1820593 (diff) | |
Ediff config
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/.config/emacs-kj/init.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el index 21095b6..b0b4a07 100644 --- a/emacs/.config/emacs-kj/init.el +++ b/emacs/.config/emacs-kj/init.el @@ -253,6 +253,12 @@ (use-package magit) (use-package org) +(use-package ediff + :init + (setq ediff-diff-options "-w" ; turn off whitespace checking + ediff-split-window-function #'split-window-horizontally + ediff-window-setup-function #'ediff-setup-windows-plain)) + (defun meow-setup () (setq meow-cheatsheet-layout meow-cheatsheet-layout-dvorak) (meow-leader-define-key |