From aece3a7f5f15ce364396a0663c870d53110c6fb5 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Wed, 27 Dec 2023 18:55:47 +0100 Subject: vim-patch:00b470052b71 runtime(diff): Update default links (vim/vim#13776) Problem: Current default links for `diffAdded`, `diffChanged`, and `diffRemoved` do not address the diff nature of the filetype. Solution: Use `DiffAdd`, `DiffChange`, and `DiffDelete`. closes: vim/vim#13759 https://github.com/vim/vim/commit/00b470052b71ca10d663186d99683e8379b21154 Co-authored-by: Evgeni Chasnovski --- runtime/syntax/diff.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'runtime/syntax/diff.vim') diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim index 4cadf5dae8..b5c3f5ecbb 100644 --- a/runtime/syntax/diff.vim +++ b/runtime/syntax/diff.vim @@ -378,9 +378,9 @@ hi def link diffBDiffer Constant hi def link diffIsA Constant hi def link diffNoEOL Constant hi def link diffCommon Constant -hi def link diffRemoved Special -hi def link diffChanged PreProc -hi def link diffAdded Identifier +hi def link diffRemoved DiffDelete +hi def link diffChanged DiffChange +hi def link diffAdded DiffAdd hi def link diffLine Statement hi def link diffSubname PreProc hi def link diffComment Comment -- cgit From f46ae1368530389129b5f7f1768c057d5d0b9c2f Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Wed, 10 Jan 2024 18:45:46 +0100 Subject: vim-patch:9.1.0016: default diff highlighting is too noisy 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 vim/vim#13776 and doc added in commit b1392be The links added in vim/vim#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: vim/vim#13776 closes vim/vim#13825 https://github.com/vim/vim/commit/124371c5a149a8c0c75c04b6c90ac11e71a0aa97 Co-authored-by: Romain Lafourcade --- runtime/syntax/diff.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'runtime/syntax/diff.vim') diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim index b5c3f5ecbb..b0a8594def 100644 --- a/runtime/syntax/diff.vim +++ b/runtime/syntax/diff.vim @@ -378,9 +378,9 @@ hi def link diffBDiffer Constant hi def link diffIsA Constant hi def link diffNoEOL Constant hi def link diffCommon Constant -hi def link diffRemoved DiffDelete -hi def link diffChanged DiffChange -hi def link diffAdded DiffAdd +hi def link diffRemoved Removed +hi def link diffChanged Changed +hi def link diffAdded Added hi def link diffLine Statement hi def link diffSubname PreProc hi def link diffComment Comment -- cgit