From 3c0d7aece4d80779d05389eba1151adb8250de0c Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Sat, 2 Sep 2017 08:01:07 +0100 Subject: [PATCH] Add further diff options --- modules/version-control.el | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/version-control.el b/modules/version-control.el index 9b8a5ad..d1b04b2 100644 --- a/modules/version-control.el +++ b/modules/version-control.el @@ -18,7 +18,8 @@ (setq init-packages/version-control-packages - '(magit) + '(magit + diff-hl) ) @@ -44,6 +45,24 @@ :config (add-hook 'magit-mode-hook 'magit-load-config-extensions)) + ;; -------------------------------------------------------------------------- + ;; Ediff. + ;; -------------------------------------------------------------------------- + + (setq ediff-diff-options "-w" + ediff-split-window-function 'split-window-horizontally + ediff-window-setup-function 'ediff-setup-windows-plain) + + + ;; -------------------------------------------------------------------------- + ;; Diff highlight mode. + ;; -------------------------------------------------------------------------- + + (use-package diff-hl + :init + (global-diff-hl-mode) + (add-hook 'dired-mode-hook 'diff-hl-dired-mode)) + ;; -------------------------------------------------------------------------- ;; Diff mode settings. ;; --------------------------------------------------------------------------