comparison runtime/syntax/gitrebase.vim @ 18831:6848b809a26e

Runtime file updates. Commit: https://github.com/vim/vim/commit/664f3cf3f21d3699bfd179c318ef5c869c085648 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Dec 7 16:03:51 2019 +0100 Runtime file updates.
author Bram Moolenaar <Bram@vim.org>
date Sat, 07 Dec 2019 16:15:05 +0100
parents 5c40013d45ee
children 3e661b0cf500
comparison
equal deleted inserted replaced
18830:a5749be04ad3 18831:6848b809a26e
1 " Vim syntax file 1 " Vim syntax file
2 " Language: git rebase --interactive 2 " Language: git rebase --interactive
3 " Maintainer: Tim Pope <vimNOSPAM@tpope.org> 3 " Maintainer: Tim Pope <vimNOSPAM@tpope.org>
4 " Filenames: git-rebase-todo 4 " Filenames: git-rebase-todo
5 " Last Change: 2019 Dec 05 5 " Last Change: 2019 Dec 06
6 6
7 if exists("b:current_syntax") 7 if exists("b:current_syntax")
8 finish 8 finish
9 endif 9 endif
10 10
21 syn match gitrebaseBreak "\v^b%(reak)=>" 21 syn match gitrebaseBreak "\v^b%(reak)=>"
22 syn match gitrebaseDrop "\v^d%(rop)=>" nextgroup=gitrebaseCommit skipwhite 22 syn match gitrebaseDrop "\v^d%(rop)=>" nextgroup=gitrebaseCommit skipwhite
23 syn match gitrebaseNoop "\v^noop>" 23 syn match gitrebaseNoop "\v^noop>"
24 syn match gitrebaseMerge "\v^m(erge)=>" nextgroup=gitrebaseMergeOption,gitrebaseName skipwhite 24 syn match gitrebaseMerge "\v^m(erge)=>" nextgroup=gitrebaseMergeOption,gitrebaseName skipwhite
25 syn match gitrebaseLabel "\v^l(abel)=>" nextgroup=gitrebaseName skipwhite 25 syn match gitrebaseLabel "\v^l(abel)=>" nextgroup=gitrebaseName skipwhite
26 syn match gitrebaseReset "\v^r(eset)=>" nextgroup=gitrebaseName skipwhite 26 syn match gitrebaseReset "\v^(t|reset)=>" nextgroup=gitrebaseName skipwhite
27 syn match gitrebaseSummary ".*" contains=gitrebaseHash contained 27 syn match gitrebaseSummary ".*" contains=gitrebaseHash contained
28 syn match gitrebaseCommand ".*" contained 28 syn match gitrebaseCommand ".*" contained
29 syn match gitrebaseComment "^\s*#.*" contains=gitrebaseHash 29 syn match gitrebaseComment "^\s*#.*" contains=gitrebaseHash
30 syn match gitrebaseSquashError "\v%^%(s%(quash)=>|f%(ixup)=>)" nextgroup=gitrebaseCommit skipwhite 30 syn match gitrebaseSquashError "\v%^%(s%(quash)=>|f%(ixup)=>)" nextgroup=gitrebaseCommit skipwhite
31 syn match gitrebaseMergeOption "\v-[Cc]>" nextgroup=gitrebaseMergeCommit skipwhite contained 31 syn match gitrebaseMergeOption "\v-[Cc]>" nextgroup=gitrebaseMergeCommit skipwhite contained