summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emacs/.config/emacs-kj/init.el6
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