Add ediff config

diff --git a/init.el b/init.el
index a972fc66108958375e0bfb07e2c80db09459aa51..5de0ec5b41f01ce5dc065c4db021be24b68b3ba3 100644 (file)
--- 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 fcce7234c0b5eaf31255ad57ac5b6a7348975979..9e56b6de591a395d6368d3862f6aa3a9fac28699 100644 (file)
--- 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)