Open
Conversation
|
@dandavison Would it be possible to push this PR forward. The current color scheme makes it hard to read the diff in magit, plus the Thank you @dandavison for both git-delta and magit-delta, and thank you @Azkae for the PR. |
Owner
|
Hi @Azkae and @mmahmoudian. @Azkae thanks very much for this work! I have not been doing a good job recently keeping up with PRs and issues, but let me get this running locally and see if I encounter any issues. @mmahmoudian thanks for the ping. Are you able to run this branch yourself locally to test it out, and to solve the problem for yourself at least? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Improve syntax highlighting by sending the emacs diff colors to delta.
This way, the colors should better match the user's theme/background.
This should also fix #28.
A few notes:
magit-delta-modeis now a global mode.Since we are using diff faces, we need to have the correct faces already loaded when enabling
magit-delta-mode. For example, if we enablemagit-delta-modebefore setting up a theme, we would use the wrong colors.Using
(add-hook 'magit-mode-hook (lambda () (magit-delta-mode +1)))works since by the time we turn on magit mode, the faces should be correct.I have also added
magit-delta-max-sizeto avoid running delta on large files. It's easier to do now thatmagit-delta-modeis a global mode.(I can move it to later PR if you prefer).
Before:
After: