From ab001eeb0ee8d2e183b7e229b1086ed89ed61c5f Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Wed, 10 Nov 2021 10:28:00 +0000
Subject: [PATCH] fix(version-control/magit): when disabled delta still caused
 issues

Turns out running (magit-delta-mode -1) to "disable" or ensure it's
disabled as a magit-mode-hook was a bad idea, as it set
magit-diff-refine-hunk to nil.

So instead, we only call magit-delta-mode when siren-magit-delta-enabled
is not nil, and the delta executable is available.
---
 modules/version-control/siren-magit.el | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/version-control/siren-magit.el b/modules/version-control/siren-magit.el
index 29bc1ac..7ce4736 100644
--- a/modules/version-control/siren-magit.el
+++ b/modules/version-control/siren-magit.el
@@ -73,22 +73,23 @@
   :custom
   (magit-delta-default-dark-theme "OneHalfDark")
   (magit-delta-default-light-theme "OneHalfLight")
-  (siren-magit-delta-auto-enable nil)
+  (siren-magit-delta-enabled nil)
 
   :init
   (defgroup siren-magit-delta nil
     "Siren specific options for magit-delta."
     :group 'magit-delta)
 
-  (defcustom siren-magit-delta-auto-enable t
-    "Automatically enable magit-delta-mode when delta executable is available."
+  (defcustom siren-magit-delta-enabled t
+    "Enable magit-delta-mode when delta executable is available."
     :type 'boolean
     :group 'siren-magit-delta)
 
   (defun siren-setup-magit-delta ()
-    (let ((delta (executable-find "delta")))
-      (when delta
-        (magit-delta-mode (if siren-magit-delta-auto-enable +1 -1))))))
+    (when siren-magit-delta-enabled
+      (let ((delta-bin (executable-find "delta")))
+        (when delta-bin
+          (magit-delta-mode +1))))))
 
 (provide 'siren-magit)
 ;;; siren-magit.el ends here