jimeh/.emacs.d
1
0
Fork 0
mirror of https://github.com/jimeh/.emacs.d.git synced 2026-02-19 13:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(version-control/magit): when disabled delta still caused issues

Browse Source 
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.
This commit is contained in:
Jim Myhrberg
2021-11-10 10:28:00 +00:00
parent f6a904e799
commit ab001eeb0e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/version-control/siren-magit.el
View File

@@ -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