summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2016-12-07 09:29:06 +0100
committerAlan Pearce2016-12-07 09:29:06 +0100
commite67e9b5e221d9b64330a148cbedaf0eef3217df4 (patch)
treea5bed7727b9f0607ae32adae42eec08977248791
parentcfd231c8243c5f90182c78afc7acdc40cf4355dd (diff)
downloadnixfiles-e67e9b5e221d9b64330a148cbedaf0eef3217df4.tar.lz
nixfiles-e67e9b5e221d9b64330a148cbedaf0eef3217df4.tar.zst
nixfiles-e67e9b5e221d9b64330a148cbedaf0eef3217df4.zip
Replace diff-hl with git-gutter-fringe
-rw-r--r--tag-emacs/emacs.d/init.org14
1 files changed, 7 insertions, 7 deletions
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index bdea6d63..ab747283 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -460,19 +460,19 @@ occasions that I’m working with something other than git.
               (setq vc-follow-symlinks t)))
 #+END_SRC
 
-** diff-hl
+** git-gutter-fringe
 
 It’s nice to be able to see at a glance which lines of a file have
-changed.  This package colours the fringe
+changed.  This package colours the fringe.  I have it set to the right
+fringe so it doesn’t interfere with flycheck.
 
 #+BEGIN_SRC emacs-lisp
-  (use-package diff-hl
+  (use-package git-gutter-fringe
     :defer 2
+    :diminish git-gutter-mode
     :config (progn
-              (global-diff-hl-mode 1)
-              (add-hook 'dired-mode-hook (lambda ()
-                                           (diff-hl-dired-mode 1)))
-              (add-hook 'magit-post-refresh-hook #'diff-hl-magit-post-refresh)))
+              (global-git-gutter-mode)
+              (setq git-gutter-fr:side 'right-fringe)))
 #+END_SRC
 
 ** magit