Commit c7fffa562849

Vincent Demeester <vincent@sbr.pm>
2020-02-17 16:18:37
configure ediff with better defaults
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent 9d72722
Changed files (2)
lisp
setup-vcs.el
emacs.org
lisp/setup-vcs.el
@@ -91,6 +91,13 @@
               (")" . dired-git-info-mode))
   :defer 2)
 
+(use-package ediff
+  :config
+  (setq ediff-window-setup-function 'ediff-setup-windows-plain)
+  (setq ediff-split-window-function 'split-window-horizontally)
+  (setq ediff-diff-options "-w")
+  (add-hook 'ediff-after-quit-hook-internal 'winner-undo))
+
 (defun git-blame-line ()
   "Runs `git blame` on the current line and
    adds the commit id to the kill ring"
emacs.org
@@ -3802,6 +3802,13 @@
               (")" . dired-git-info-mode))
   :defer 2)
 
+(use-package ediff
+  :config
+  (setq ediff-window-setup-function 'ediff-setup-windows-plain)
+  (setq ediff-split-window-function 'split-window-horizontally)
+  (setq ediff-diff-options "-w")
+  (add-hook 'ediff-after-quit-hook-internal 'winner-undo))
+
 (defun git-blame-line ()
   "Runs `git blame` on the current line and
    adds the commit id to the kill ring"