diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2025-01-03 10:42:40 +0100 |
|---|---|---|
| committer | Christian Clason <ch.clason+github@icloud.com> | 2025-01-03 11:45:10 +0100 |
| commit | f1f42ec063795f9461d9744d62eaaa6cc978ea56 (patch) | |
| tree | 0f7b3951c90993b4954be2b4ec40eb56c87828e2 | |
| parent | 6aceab7c201f93d96b4359f0e1d97bd6f2f29ea6 (diff) | |
| download | rneovim-f1f42ec063795f9461d9744d62eaaa6cc978ea56.tar.gz rneovim-f1f42ec063795f9461d9744d62eaaa6cc978ea56.tar.bz2 rneovim-f1f42ec063795f9461d9744d62eaaa6cc978ea56.zip | |
vim-patch:bde76da: runtime(jj): Support diffs in jj syntax
related: vim/vim#16364
https://github.com/vim/vim/commit/bde76da4d02d93d8ea9e523d1057d59a19de276a
Co-authored-by: Gregory Anders <greg@gpanders.com>
| -rw-r--r-- | runtime/syntax/jj.vim | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/runtime/syntax/jj.vim b/runtime/syntax/jj.vim index a2911a0268..0b2d29e878 100644 --- a/runtime/syntax/jj.vim +++ b/runtime/syntax/jj.vim @@ -6,7 +6,6 @@ if exists('b:current_syntax') finish endif -let b:current_syntax = 'jj' syn match jjAdded "A .*" contained syn match jjRemoved "D .*" contained @@ -14,7 +13,12 @@ syn match jjChanged "M .*" contained syn region jjComment start="^JJ: " end="$" contains=jjAdded,jjRemoved,jjChanged +syn include @jjCommitDiff syntax/diff.vim +syn region jjCommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|@@\@!\|[^[:alnum:]\ +-]\S\@!\)\@=/ fold contains=@jjCommitDiff + hi def link jjComment Comment hi def link jjAdded Added hi def link jjRemoved Removed hi def link jjChanged Changed + +let b:current_syntax = 'jj' |