From: rearman <rearman@r717.net>
Date: Tue, 24 Jan 2023 23:31:41 +0000 (-0500)
Subject: Add ediff config
X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=c42801912d132b891c1a939330b80c2654a38d70;p=emacsinit.git

Add ediff config
---

diff --git a/init.el b/init.el
index a972fc6..5de0ec5 100644
--- a/init.el
+++ b/init.el
@@ -11,6 +11,8 @@
 ;; SETUP FOR SHARED WINDOWS/WSL INIT
 (if (eq system-type 'windows-nt)
     (progn (setq delete-by-moving-to-trash t
+		 ediff-diff-program "c:/Program Files/Git/usr/bin/diff.exe"
+		 ediff-diff3-program "c:/Program Files/Git/usr/bin/diff3.exe"
 		 openwith-associations '(("\\.pdf\\'" "sumatrapdf" (file))
 					 ("\\.xls\\'" "excel" (file))
 					 ("\\.xlsx\\'" "excel" (file))
diff --git a/setq-defaults.el b/setq-defaults.el
index fcce723..9e56b6d 100644
--- a/setq-defaults.el
+++ b/setq-defaults.el
@@ -20,7 +20,11 @@
       blink-matching-paren 'jump
       global-hl-line-sticky-flag t
       echo-keystrokes 0.01
-      save-interprogram-paste-before-kill t)
+      save-interprogram-paste-before-kill t
+      ediff-window-setup-function 'ediff-setup-windows-plain
+      ediff-split-window-function (if (> (frame-width) 150)
+					 'split-window-horizontally
+					 'split-window-vertically))
 
 ;; OPTIONS
 (recentf-mode t)