From 497c23a0f12c6f5c8279c7cb5ba9ad52c931fd3b Mon Sep 17 00:00:00 2001
From: ClarityStorm <45301623+claritystorm@users.noreply.github.com>
Date: Wed, 23 Sep 2020 20:40:45 +0100
Subject: [PATCH] Fix git-gutter+ refresh on Magit refresh (#13958)

---
 layers/+source-control/version-control/funcs.el    | 4 ++++
 layers/+source-control/version-control/packages.el | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/layers/+source-control/version-control/funcs.el b/layers/+source-control/version-control/funcs.el
index 65747225f..a12bc4a58 100644
--- a/layers/+source-control/version-control/funcs.el
+++ b/layers/+source-control/version-control/funcs.el
@@ -152,3 +152,7 @@ the number of conflicts detected by `smerge-mode'."
   (interactive)
   (setq spacemacs--smerge-ts-full-hint-toggle
         (not spacemacs--smerge-ts-full-hint-toggle)))
+
+(when (configuration-layer/package-used-p 'git-gutter+)
+  (defun spacemacs//git-gutter+-refresh-in-all-buffers ()
+    (git-gutter+-in-all-buffers (when git-gutter+-mode (git-gutter+-refresh)))))
diff --git a/layers/+source-control/version-control/packages.el b/layers/+source-control/version-control/packages.el
index e9dbe1343..2b3ed9ec1 100644
--- a/layers/+source-control/version-control/packages.el
+++ b/layers/+source-control/version-control/packages.el
@@ -205,10 +205,8 @@
     (progn
       ;; If you enable global minor mode
       (when version-control-global-margin
-        ;; (defun spacemacs//git-gutter+-refresh-in-all-buffers ()
-        ;;   (git-gutter+-in-all-buffers (git-gutter+-refresh)))
-        ;; (add-hook 'magit-pre-refresh-hook #'spacemacs//git-gutter+-refresh-in-all-buffers)
-        (add-hook 'magit-pre-refresh-hook 'git-gutter+-refresh)
+        (add-hook 'magit-pre-refresh-hook
+                  #'spacemacs//git-gutter+-refresh-in-all-buffers)
         (run-with-idle-timer 1 nil 'global-git-gutter+-mode))
       (setq
        git-gutter+-modified-sign " "