Adapted more configs from other emacs configs

Including wasamasa and jwiegley

1 files changed, 13 insertions, 3 deletions

diff --git a/emacs/.emacs.d/init/ycp-vc.el b/emacs/.emacs.d/init/ycp-vc.el
index d9de2ca..66bb06f 100644
--- a/emacs/.emacs.d/init/ycp-vc.el
+++ b/emacs/.emacs.d/init/ycp-vc.el
@@ -52,7 +52,6 @@
   (setq ediff-make-buffers-readonly-at-startup nil)
   (setq ediff-show-clashes-only t)
   (setq ediff-split-window-function 'split-window-horizontally)
-  (setq ediff-window-setup-function 'ediff-setup-windows-plain)
   )
 
 (my-package vc-git
@@ -61,6 +60,17 @@
                '(vc-git-annotate-switches . "-w"))
   (setq vc-git-grep-template "git --no-pager grep -n <C> -A1 -B1 -e <R> -- <F>"))
 
+(my-package diff-hl
+  (:delay 30)
+  (:install t)
+  (global-diff-hl-mode)
+  (diff-hl-flydiff-mode))
+
+(my-package diffview
+  (:delay 30)
+  (:install t)
+  )
+
 (my-package git-commit
   (:install t)
   (:delay 30)
@@ -78,14 +88,14 @@
   (require 'magit-repos)
   (my-setq-from-local magit-repository-directories)
   (put 'magit-clean 'disabled nil)
-)
+  )
 
 (my-package my-magit
   (:delay 30)
   (my-keybind global-map
     "C-x pM" #'my-project-magit-at
     "C-x g" #'my-magit-status)
-)
+  )
 
 (my-package magit-annex
   (:delay 60))