From 52e1c0080f1e85f37de150503710d5ec1848d9de Mon Sep 17 00:00:00 2001 From: Peter Grayson Date: Fri, 9 Jul 2021 19:09:03 -0400 Subject: [PATCH] Update stgedit.vim for Patch header The new capability to edit the patch name in the editor with `stg edit` introduced the "Patch:" header to the .stgit-edit.patch file. The stgedit.vim syntax file is updated to comprehend this new header as well as eliminate its dependency on vim's built-in mail.vim syntax. Signed-off-by: Peter Grayson --- contrib/vim/syntax/stgedit.vim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/vim/syntax/stgedit.vim b/contrib/vim/syntax/stgedit.vim index 9ee4e85..2ae3b31 100644 --- a/contrib/vim/syntax/stgedit.vim +++ b/contrib/vim/syntax/stgedit.vim @@ -6,10 +6,6 @@ if exists("b:current_syntax") finish endif - -runtime! syntax/mail.vim -unlet b:current_syntax - syn include @stgDiff syntax/diff.vim @@ -22,7 +18,9 @@ if has("spell") endif -syn match stgeditFrom "\%^From:.*" contains=mailHeader nextgroup=stgeditFirstLine skipempty +syn region stgeditHeaders start="\%^\S\+:" end="^$" nextgroup=stgeditFirstLine skipempty contains=stgeditHeaderKey,stgeditEmailAddr +syn match stgeditHeaderKey "^\S\+:" contained +syn match stgeditEmailAddr "<.\{-}>" contained contains=@NoSpell syn match stgeditFirstLine "^.\+" contained nextgroup=stgeditDiffs,stgeditComment,stgeditBlank skipnl syn match stgeditSummary "^.\{0,50\}" contained containedin=stgeditFirstLine nextgroup=stgeditOverflow contains=@Spell syn match stgeditOverflow ".*" contained contains=@Spell @@ -31,6 +29,8 @@ syn match stgeditComment "^#.*" syn region stgeditDiffs start="^---" end="%$" contains=@stgDiff fold syn region stgeditDiff start="^\%(diff --git \)\@=" end="^\%(diff --git \|$\)\@=" contained containedin=stgeditDiffs contains=@stgDiff fold +hi def link stgeditHeaderKey Type +hi def link stgeditEmailAddr Special hi def link stgeditSummary Keyword hi def link stgeditComment Comment hi def link stgeditBlank Error -- 2.11.4.GIT