config/emacs
config/emacs
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add further diff options

Browse Source
This commit is contained in:
Wojciech Kozlowski 2017-09-02 08:01:07 +01:00
parent 980bee8e14
commit 3c0d7aece4
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/version-control.el
View File

@ -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.
;; --------------------------------------------------------------------------