version control: let the user pick on which side to display the diff

This commit is contained in:
Emmanuel Touzery 2016-11-01 10:27:45 +01:00 committed by bmag
parent 0fa634c11c
commit 1176a23dff
2 changed files with 13 additions and 3 deletions

View File

@ -35,6 +35,13 @@ by setting =version-control-diff-tool=
version-control-diff-tool 'diff-hl)
#+END_SRC
You can choose the side on which the diff appears (by default it's the right side)
#+BEGIN_SRC emacs-lisp
'(version-control :variables
version-control-side 'left)
#+END_SRC
To automatically enable diff margins in all buffers, set
=version-control-global-margin=

View File

@ -40,7 +40,8 @@
(global-diff-hl-mode))
(diff-hl-margin-mode)
(spacemacs|do-after-display-system-init
(setq diff-hl-side 'right)
(setq diff-hl-side (if (eq version-control-side 'left)
'left 'right))
(diff-hl-margin-mode -1))))))
(defun version-control/post-init-evil-unimpaired ()
@ -80,7 +81,8 @@
(spacemacs|do-after-display-system-init
(with-eval-after-load 'git-gutter
(require 'git-gutter-fringe)))
(setq git-gutter-fr:side 'right-fringe))
(setq git-gutter-fr:side (if (eq version-control-side 'left)
'left-fringe 'right-fringe)))
:config
(progn
;; custom graphics that works nice with half-width fringes
@ -141,7 +143,8 @@
(spacemacs|do-after-display-system-init
(with-eval-after-load 'git-gutter+
(require 'git-gutter-fringe+)))
(setq git-gutter-fr+-side 'right-fringe))
(setq git-gutter-fr+-side (if (eq version-control-side 'left)
'left-fringe 'right-fringe)))
:config
(progn
;; custom graphics that works nice with half-width fringes