From 1ebaa43e5f8bd8a8a9917556e2bdcd1c57e8d0d3 Mon Sep 17 00:00:00 2001
From: JaeYoo-Im <cpu3792@gmail.com>
Date: Thu, 28 Oct 2021 17:32:43 +0900
Subject: [PATCH] Emacs : Ediff

---
 .emacs.d/emacs.org | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.emacs.d/emacs.org b/.emacs.d/emacs.org
index 239c4b9..9c35530 100644
--- a/.emacs.d/emacs.org
+++ b/.emacs.d/emacs.org
@@ -1280,6 +1280,13 @@ https://emacs.stackexchange.com/a/30691
                                       ("\\subsection{%s}" . "\\subsection*{%s}"))))
 #+end_src
 
+* EDiff
+#+begin_src emacs-lisp
+;; Don't let ediff break EXWM, keep it in one frame
+(setq ediff-diff-options "-w"
+      ediff-split-window-function 'split-window-horizontally
+      ediff-window-setup-function 'ediff-setup-windows-plain)
+#+end_src
 * Rainbow Delimiters
 #+begin_src emacs-lisp
   (use-package rainbow-delimiters