From cce2a5b8c4407e39214f1876c677e3eb1f7c9470 Mon Sep 17 00:00:00 2001
From: James Cherti <60946298+jamescherti@users.noreply.github.com>
Date: Mon, 26 Aug 2024 16:48:21 -0400
Subject: [PATCH] Configure Ediff to use a single frame and split windows
 horizontally

---
 README.md | 1 +
 init.el   | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 41be99b..fa36e53 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,7 @@ git clone https://github.com/jamescherti/minimal-emacs.d ~/.emacs.d
 
 10. **Miscellaneous**
     - Configure recentf, savehist, and auto-save
+    - Configure Ediff to use a single frame and split windows horizontally
 
 ## Update
 
diff --git a/init.el b/init.el
index d7667de..6942a32 100644
--- a/init.el
+++ b/init.el
@@ -336,6 +336,12 @@
 ;; Avoid automatic frame resizing when adjusting settings.
 (setq global-text-scale-adjust-resizes-frames nil)
 
+;;; Ediff
+
+;; Configure Ediff to use a single frame and split windows horizontally
+(setq ediff-window-setup-function #'ediff-setup-windows-plain
+      ediff-split-window-function #'split-window-horizontally)
+
 ;;; Load post-init.el
 (minimal-emacs-load-user-init "post-init.el")