diff options
author | Romain Lafourcade <romain.lafourcade@razorfish.fr> | 2024-01-07 15:08:31 +0100 |
---|---|---|
committer | Christian Brabandt <cb@256bit.org> | 2024-01-07 23:32:19 +0100 |
commit | 124371c5a149a8c0c75c04b6c90ac11e71a0aa97 (patch) | |
tree | 765d5c2041967f9c6fef195fe343d9234a030e90 /src | |
parent | b21499537fb9fd0ff407e6113ac60ebd82058e2a (diff) |
patch 9.1.0016: default diff highlighting is too noisyv9.1.0016
Problem: default diff highlighting is too noisy
Solution: Link diff highlighting groups to new
Added/Removed/Changed, revert previous change
(Romain Lafourcade)
Remove diff* links added in #13776 and doc added in commit b1392be
The links added in #13776 are way too noisy for the contexts in which
the `diff` syntax is applied (git commits, patches, etc.).
This commit:
- removes those links
- adds new default highlighting groups Added, Changed and
Removed
- links the diff highlighting groups to those new defaults
- removes the doc changes
- adjusts the syntax_completion test for those newly added group
names
Note: Changes to the default color schemes will be handled separately,
by adding links to those newly created Added/Removed/Changed
highlighting groups.
related: #13776
closes #13825
Signed-off-by: Romain Lafourcade <romain.lafourcade@razorfish.fr>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_syntax.vim | 6 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_syntax.vim b/src/testdir/test_syntax.vim index 8c56730daf..aeb2c51c58 100644 --- a/src/testdir/test_syntax.vim +++ b/src/testdir/test_syntax.vim @@ -193,14 +193,14 @@ func Test_syntax_completion() " Check that clearing "Aap" avoids it showing up before Boolean. hi Aap ctermfg=blue call feedkeys(":syn list \<C-A>\<C-B>\"\<CR>", 'tx') - call assert_match('^"syn list Aap Boolean Character ', @:) + call assert_match('^"syn list Aap Added Boolean Changed Character ', @:) hi clear Aap call feedkeys(":syn list \<C-A>\<C-B>\"\<CR>", 'tx') - call assert_match('^"syn list Boolean Character ', @:) + call assert_match('^"syn list Added Boolean Changed Character ', @:) call feedkeys(":syn match \<C-A>\<C-B>\"\<CR>", 'tx') - call assert_match('^"syn match Boolean Character ', @:) + call assert_match('^"syn match Added Boolean Changed Character ', @:) syn cluster Aax contains=Aap call feedkeys(":syn list @A\<C-A>\<C-B>\"\<CR>", 'tx') diff --git a/src/version.c b/src/version.c index 9a4106de49..2e178f3bb3 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 16, +/**/ 15, /**/ 14, |