From 5750405c72761414854658f5f8b227cb9c16ee8f Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Mon, 13 Apr 2020 12:09:56 -0400
Subject: [PATCH] Assimilate diff-hl 1.8.7-10-ga625033

---
 .gitmodules | 3 +++
 init.el     | 7 +++++--
 lib/diff-hl | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 160000 lib/diff-hl

diff --git a/.gitmodules b/.gitmodules
index 7aad07e..c500cfb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,6 +18,9 @@
 	# that the submodule is dirty. so, let's ignore the untracked
 	# files of dash's submodule
 	ignore = untracked
+[submodule "diff-hl"]
+	path = lib/diff-hl
+	url = https://github.com/dgutov/diff-hl.git
 [submodule "ebdb"]
 	path = lib/ebdb
 	url = https://github.com/girzel/ebdb.git
diff --git a/init.el b/init.el
index 24765c8..3826466 100644
--- a/init.el
+++ b/init.el
@@ -656,14 +656,16 @@ For disabling the behaviour for certain buffers and/or modes."
 
 
 ;;; Editing
-(comment
+
 ;; highlight uncommitted changes in the left fringe
 (use-package diff-hl
   :defer 0.6
   :config
   (setq diff-hl-draw-borders nil)
   (global-diff-hl-mode)
-  :hook (magit-post-refresh . diff-hl-magit-post-refresh))
+  :hook
+  ((magit-pre-refresh . diff-hl-magit-pre-refresh)
+   (magit-post-refresh . diff-hl-magit-post-refresh)))
 
 ;; display Lisp objects at point in the echo area
 (use-package eldoc
@@ -735,6 +737,7 @@ For disabling the behaviour for certain buffers and/or modes."
   ;; (global-company-mode t)
   )
 
+(comment
 (use-package flycheck
   :defer 0.6
   :hook (prog-mode . flycheck-mode)
diff --git a/lib/diff-hl b/lib/diff-hl
new file mode 160000
index 0000000..a625033
--- /dev/null
+++ b/lib/diff-hl
@@ -0,0 +1 @@
+Subproject commit a625033fb1dde83f6e4c2fc21f632b22ec34b609
-- 
2.20.1