2015-06-10 02:19:16 +00:00
|
|
|
;;; packages.el --- Source Control Layer packages File for Spacemacs
|
|
|
|
|
;;
|
|
|
|
|
;; Copyright (c) 2012-2014 Sylvain Benner
|
|
|
|
|
;; Copyright (c) 2014-2015 Sylvain Benner & Contributors
|
|
|
|
|
;;
|
|
|
|
|
;; Author: Sylvain Benner <sylvain.benner@gmail.com>
|
|
|
|
|
;; URL: https://github.com/syl20bnr/spacemacs
|
|
|
|
|
;;
|
|
|
|
|
;; This file is not part of GNU Emacs.
|
|
|
|
|
;;
|
|
|
|
|
;;; License: GPLv3
|
|
|
|
|
|
|
|
|
|
(setq version-control-packages
|
|
|
|
|
'(
|
|
|
|
|
diff-mode
|
|
|
|
|
diff-hl))
|
|
|
|
|
|
|
|
|
|
(defun version-control/init-diff-mode ()
|
|
|
|
|
(use-package diff-mode
|
|
|
|
|
:defer t
|
|
|
|
|
:config
|
2015-11-21 10:07:14 +00:00
|
|
|
(evilified-state-evilify diff-mode diff-mode-map
|
|
|
|
|
"j" 'diff-hunk-next
|
|
|
|
|
"k" 'diff-hunk-prev)))
|
2015-06-10 02:19:16 +00:00
|
|
|
|
|
|
|
|
(defun version-control/init-diff-hl ()
|
|
|
|
|
(use-package diff-hl
|
|
|
|
|
:init
|
|
|
|
|
(progn
|
|
|
|
|
(setq diff-hl-side 'right)
|
|
|
|
|
(global-diff-hl-mode)
|
|
|
|
|
(unless (display-graphic-p)
|
|
|
|
|
(setq diff-hl-side 'left)
|
|
|
|
|
(diff-hl-margin-mode))
|
|
|
|
|
(evil-leader/set-key
|
2015-11-02 05:16:13 +00:00
|
|
|
"gdg" 'diff-hl-diff-goto-hunk
|
|
|
|
|
"gdN" 'diff-hl-previous-hunk
|
|
|
|
|
"gdn" 'diff-hl-next-hunk
|
|
|
|
|
"gdr" 'diff-hl-revert-hunk))))
|
