Skip to content

Commit

Permalink
Respond to upstream changes in magit
Browse files Browse the repository at this point in the history
  • Loading branch information
dandavison committed Apr 22, 2020
1 parent e20ff80 commit 2b02aad
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions magit-delta.el
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"The color theme to use when Emacs has a dark background.")

(setq magit-delta--magit-diff-refine-hunk--orig-value magit-diff-refine-hunk
magit-diff-convert-ansi-escape-sequences-function--orig-value magit-diff-convert-ansi-escape-sequences-function
magit-diff-convert-ansi-escape-sequences-always--orig-value magit-diff-convert-ansi-escape-sequences-always)
magit-diff-preprocess-git-output-function--orig-value magit-diff-preprocess-git-output-function
magit-diff-preprocess-git-output-always--orig-value magit-diff-preprocess-git-output-always)

(define-minor-mode magit-delta-mode
"Use delta to view diffs in magit.
Expand All @@ -41,16 +41,16 @@ https://github.com/dandavison/delta"
(cond
(magit-delta-mode
(setq magit-delta--magit-diff-refine-hunk--orig-value magit-diff-refine-hunk
magit-diff-convert-ansi-escape-sequences-always t
magit-diff-convert-ansi-escape-sequences-function #'magit-delta-call-delta-and-convert-ansi-escape-sequences
magit-diff-preprocess-git-output-always t
magit-diff-preprocess-git-output-function #'magit-delta-call-delta-and-convert-ansi-escape-sequences
face-remapping-alist (nconc
(--remove (member (car it) magit-faces-to-override)
face-remapping-alist)
(--map (cons it 'default) magit-faces-to-override))
magit-diff-refine-hunk nil))
('deactivate
(setq magit-diff-convert-ansi-escape-sequences-always magit-diff-convert-ansi-escape-sequences-always--orig-value
magit-diff-convert-ansi-escape-sequences-function magit-diff-convert-ansi-escape-sequences-function--orig-value
(setq magit-diff-preprocess-git-output-always magit-diff-preprocess-git-output-always--orig-value
magit-diff-preprocess-git-output-function magit-diff-preprocess-git-output-function--orig-value
face-remapping-alist (--remove (member (car it) magit-faces-to-override)
face-remapping-alist)
magit-diff-refine-hunk magit-delta--magit-diff-refine-hunk--orig-value)))))
Expand Down

0 comments on commit 2b02aad

Please sign in to comment.