From 4100562febcfbfc66862c185035fd0ba67beb8ac Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Thu, 29 Sep 2022 14:21:17 -0700 Subject: Ediff config --- emacs/.config/emacs-kj/init.el | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'emacs') 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 -- cgit v1.2.3