From b6cc87ca3871a44d6b3098b2119fbee230693b31 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Mon, 13 Sep 2021 19:52:36 -0500
Subject: Configure ediff

---
 init.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index 9fbc245..13121e7 100644
--- a/init.el
+++ b/init.el
@@ -589,8 +589,11 @@ AKA, DO NOT USE THIS FUNCTION!!!"
                        cmd))))))
 
 (setup ediff
-  (:option ediff-window-setup-function #'ediff-setup-windows-plain
-           ediff-split-window-function #'split-window-horizontally))
+  (:option ediff-diff-options "-w" ; ignore whitespace
+           ediff-window-setup-function #'ediff-setup-windows-plain
+           ediff-split-window-function #'split-window-horizontally)
+  ;; https://oremacs.com/2015/01/17/setting-up-ediff/
+  (add-hook 'ediff-after-quit-hook-internal #'winner-undo))
 
 (setup (:straight edit-indirect))
 
-- 
cgit 1.4.1-21-gabe81