From e20f574b2e679a65facfba176f5671443cc50f88 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 25 Feb 2020 12:49:52 -0500
Subject: [PATCH] Fix git-gutter in indirect buffers

---
 modules/ui/vc-gutter/config.el | 43 +++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/modules/ui/vc-gutter/config.el b/modules/ui/vc-gutter/config.el
index c45be123d..a5dd92887 100644
--- a/modules/ui/vc-gutter/config.el
+++ b/modules/ui/vc-gutter/config.el
@@ -28,27 +28,28 @@ flycheck indicators moved to the right fringe.")
 
 If the buffer doesn't represent an existing file, `git-gutter-mode's activation
 is deferred until the file is saved. Respects `git-gutter:disabled-modes'."
-      (when (or +vc-gutter-in-remote-files
-                (not (file-remote-p (or buffer-file-name default-directory))))
-        (if (not buffer-file-name)
-            (add-hook 'after-save-hook #'+vc-gutter-init-maybe-h nil 'local)
-          (when (and (vc-backend buffer-file-name)
-                     (progn
-                       (require 'git-gutter)
-                       (not (memq major-mode git-gutter:disabled-modes))))
-            (if (and (display-graphic-p)
-                     (require 'git-gutter-fringe nil t))
-                (progn
-                  (setq-local git-gutter:init-function      #'git-gutter-fr:init)
-                  (setq-local git-gutter:view-diff-function #'git-gutter-fr:view-diff-infos)
-                  (setq-local git-gutter:clear-function     #'git-gutter-fr:clear)
-                  (setq-local git-gutter:window-width -1))
-              (setq-local git-gutter:init-function      'nil)
-              (setq-local git-gutter:view-diff-function #'git-gutter:view-diff-infos)
-              (setq-local git-gutter:clear-function     #'git-gutter:clear-diff-infos)
-              (setq-local git-gutter:window-width 1))
-            (git-gutter-mode +1)
-            (remove-hook 'after-save-hook #'+vc-gutter-init-maybe-h 'local))))))
+      (let ((file-name (buffer-file-name (buffer-base-buffer))))
+        (when (or +vc-gutter-in-remote-files
+                  (not (file-remote-p (or file-name default-directory))))
+          (if (null file-name)
+              (add-hook 'after-save-hook #'+vc-gutter-init-maybe-h nil 'local)
+            (when (and (vc-backend file-name)
+                       (progn
+                         (require 'git-gutter)
+                         (not (memq major-mode git-gutter:disabled-modes))))
+              (if (and (display-graphic-p)
+                       (require 'git-gutter-fringe nil t))
+                  (progn
+                    (setq-local git-gutter:init-function      #'git-gutter-fr:init)
+                    (setq-local git-gutter:view-diff-function #'git-gutter-fr:view-diff-infos)
+                    (setq-local git-gutter:clear-function     #'git-gutter-fr:clear)
+                    (setq-local git-gutter:window-width -1))
+                (setq-local git-gutter:init-function      'nil)
+                (setq-local git-gutter:view-diff-function #'git-gutter:view-diff-infos)
+                (setq-local git-gutter:clear-function     #'git-gutter:clear-diff-infos)
+                (setq-local git-gutter:window-width 1))
+              (git-gutter-mode +1)
+              (remove-hook 'after-save-hook #'+vc-gutter-init-maybe-h 'local)))))))
 
   ;; Disable in Org mode, as per
   ;; <https://github.com/syl20bnr/spacemacs/issues/10555> and