make diff-highlight use ordinary configurable colors #625
Conversation
This file contains 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
jonas
reviewed
Jun 29, 2017
src/line.c
Outdated
| assert(type < line_rules); | ||
| rule = &line_rule[type]; | ||
|
|
||
| /* special highlight types are not prefix-dependent */ | ||
| if ((type == LINE_DIFF_ADD_HIGHLIGHT) || (type == LINE_DIFF_DEL_HIGHLIGHT)) |
There was a problem hiding this comment.
I think it would make sense to allow stage.diff-add-highlight to use a different color in the stage view, but I don't feel strongly about that.
There was a problem hiding this comment.
Why not, when deleting code adds the feature.
jonas
approved these changes
Jun 29, 2017
rolandwalker
force-pushed
the
diff-highlight-configurable
branch
from
2939b35 to
10aa3f6
Compare
rolandwalker
force-pushed
the
diff-highlight-configurable
branch
from
10aa3f6 to
c02aa82
Compare
|
Thank you. |
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.
diff-add-highlightanddiff-del-highlightbecome ordinary colors independently governing the fg/bg/attributes of the highlighted cells.These entries are added to the system tigrc such that the out-of-box configuration is unchanged, though if the user previously customized some diff colors, diff highlight cells will not follow them automatically.
Rationale: independent coloring of four states matches functionality of
diff-highlightitself. Net reduction of logic. Dimmer colors for the backgrounded regions are a readability improvement.