From 8df4ac4867aa84ba31ae0b0a738a39b46e9747a3 Mon Sep 17 00:00:00 2001
From: Derek Taylor <derek@distrotube.com>
Date: Fri, 17 Nov 2023 18:45:13 -0600
Subject: [PATCH] Adding ediff customization options

---
 .config/emacs/config.el  | 10 ++++++++++
 .config/emacs/config.org | 16 ++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/.config/emacs/config.el b/.config/emacs/config.el
index 41bb77a..b47a5c8 100644
--- a/.config/emacs/config.el
+++ b/.config/emacs/config.el
@@ -70,6 +70,16 @@
     (evil-define-key 'normal peep-dired-mode-map (kbd "k") 'peep-dired-prev-file)
 )
 
+(setq ediff-split-window-function 'split-window-horizontally
+      ediff-window-setup-function 'ediff-setup-windows-plain)
+
+(defun dt-ediff-hook ()
+  (ediff-setup-keymap)
+  (define-key ediff-mode-map "j" 'ediff-next-difference)
+  (define-key ediff-mode-map "k" 'ediff-previous-difference))
+
+(add-hook 'ediff-mode-hook 'dt-ediff-hook)
+
 (use-package elfeed
   :config
   (setq elfeed-search-feed-face ":foreground #ffffff :weight bold"
diff --git a/.config/emacs/config.org b/.config/emacs/config.org
index 865fcf1..8cc559f 100644
--- a/.config/emacs/config.org
+++ b/.config/emacs/config.org
@@ -14,6 +14,7 @@
 - [[#dashboard][DASHBOARD]]
 - [[#diminish][DIMINISH]]
 - [[#dired][DIRED]]
+- [[#ediff][EDIFF]]
 - [[#elfeed][ELFEED]]
 - [[#eradio][ERADIO]]
 - [[#evil][EVIL]]
@@ -165,6 +166,21 @@ This package implements hiding or abbreviation of the modeline displays (lighter
 
 #+end_src
 
+* EDIFF
+'ediff' is a diff program that is built into Emacs.
+
+#+begin_src emacs-lisp
+(setq ediff-split-window-function 'split-window-horizontally
+      ediff-window-setup-function 'ediff-setup-windows-plain)
+
+(defun dt-ediff-hook ()
+  (ediff-setup-keymap)
+  (define-key ediff-mode-map "j" 'ediff-next-difference)
+  (define-key ediff-mode-map "k" 'ediff-previous-difference))
+
+(add-hook 'ediff-mode-hook 'dt-ediff-hook)
+#+end_src 
+
 * ELFEED
 An RSS newsfeed reader for Emacs.  Move through the articles with 'j/k'.  Move through the stories with 'CTRL j/k' when in other frame.