Attachment 911608 Details for Bug 1112441 – patch that brings new keywords into vim syntax file for git, from vim-7.4

[patch] patch that brings new keywords into vim syntax file for git, from vim-7.4

vim-7.2-git-syntax-vim74.patch (text/plain), 18.86 KB, created by Evgueni Souleimanov on 2014-06-24 00:59:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Evgueni Souleimanov

Created: 2014-06-24 00:59:20 UTC

Size: 18.86 KB

patch

obsolete

>diff -urN b/runtime/ftplugin/gitcommit.vim c/runtime/ftplugin/gitcommit.vim
>--- b/runtime/ftplugin/gitcommit.vim	2014-06-22 15:47:19.000000000 -0400
>+++ c/runtime/ftplugin/gitcommit.vim	2013-05-30 11:04:36.000000000 -0400
>@@ -1,7 +1,7 @@
> " Vim filetype plugin
>-" Language:	git config file
>-" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
>-" Last Change:	2008 Jun 04
>+" Language:	git commit file
>+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
>+" Last Change:	2013 May 30
> 
> " Only do this when not done yet for this buffer
> if (exists("b:did_ftplugin"))
>@@ -11,13 +11,14 @@
> runtime! ftplugin/git.vim
> let b:did_ftplugin = 1
> 
>+setlocal nomodeline tabstop=8 formatoptions-=croq formatoptions+=tl
>+
>+let b:undo_ftplugin = 'setl modeline< tabstop< formatoptions<'
>+
> if &textwidth == 0
>   " make sure that log messages play nice with git-log on standard terminals
>   setlocal textwidth=72
>-  if !exists("b:undo_ftplugin")
>-      let b:undo_ftplugin = ""
>-  endif
>-  let b:undo_ftplugin = b:undo_ftplugin . "|setl tw<"
>+  let b:undo_ftplugin .= "|setl tw<"
> endif
> 
> if exists("g:no_gitcommit_commands") || v:version < 700
>@@ -28,8 +29,6 @@
>   let b:git_dir = expand("%:p:h")
> endif
> 
>-" Automatically diffing can be done with:
>-"   autocmd FileType gitcommit DiffGitCached | wincmd p
> command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0,b:git_dir,<f-args>)
> 
> function! s:diffcomplete(A,L,P)
>@@ -58,11 +57,11 @@
>   else
>     let extra = "-p --stat=".&columns
>   endif
>-  call system(git." diff --cached --no-color ".extra." > ".(exists("*shellescape") ? shellescape(name) : name))
>+  call system(git." diff --cached --no-color --no-ext-diff ".extra." > ".(exists("*shellescape") ? shellescape(name) : name))
>   exe "pedit ".(exists("*fnameescape") ? fnameescape(name) : name)
>   wincmd P
>   let b:git_dir = a:gitdir
>   command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0,b:git_dir,<f-args>)
>-  nnoremap <silent> q :q<CR>
>+  nnoremap <buffer> <silent> q :q<CR>
>   setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=git
> endfunction
>diff -urN b/runtime/ftplugin/gitconfig.vim c/runtime/ftplugin/gitconfig.vim
>--- b/runtime/ftplugin/gitconfig.vim	2007-12-16 23:45:14.000000000 -0500
>+++ c/runtime/ftplugin/gitconfig.vim	2010-05-15 07:04:03.000000000 -0400
>@@ -1,7 +1,7 @@
> " Vim filetype plugin
> " Language:	git config file
>-" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
>-" Last Change:	2007 Dec 16
>+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
>+" Last Change:	2009 Dec 24
> 
> " Only do this when not done yet for this buffer
> if (exists("b:did_ftplugin"))
>diff -urN b/runtime/ftplugin/gitrebase.vim c/runtime/ftplugin/gitrebase.vim
>--- b/runtime/ftplugin/gitrebase.vim	2014-06-22 15:48:15.000000000 -0400
>+++ c/runtime/ftplugin/gitrebase.vim	2010-05-21 05:49:38.000000000 -0400
>@@ -1,7 +1,7 @@
> " Vim filetype plugin
> " Language:	git rebase --interactive
>-" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
>-" Last Change:	2008 Apr 16
>+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
>+" Last Change:	2010 May 21
> 
> " Only do this when not done yet for this buffer
> if (exists("b:did_ftplugin"))
>@@ -22,12 +22,14 @@
> endfunction
> 
> function! s:cycle()
>-  call s:choose(get({'s':'edit','p':'squash'},getline('.')[0],'pick'))
>+  call s:choose(get({'s':'edit','p':'squash','e':'reword','r':'fixup'},getline('.')[0],'pick'))
> endfunction
> 
> command! -buffer -bar Pick   :call s:choose('pick')
> command! -buffer -bar Squash :call s:choose('squash')
> command! -buffer -bar Edit   :call s:choose('edit')
>+command! -buffer -bar Reword :call s:choose('reword')
>+command! -buffer -bar Fixup  :call s:choose('fixup')
> command! -buffer -bar Cycle  :call s:cycle()
> " The above are more useful when they are mapped; for example:
> "nnoremap <buffer> <silent> S :Cycle<CR>
>diff -urN b/runtime/ftplugin/gitsendemail.vim c/runtime/ftplugin/gitsendemail.vim
>--- b/runtime/ftplugin/gitsendemail.vim	2007-12-16 23:45:20.000000000 -0500
>+++ c/runtime/ftplugin/gitsendemail.vim	2010-05-15 07:04:03.000000000 -0400
>@@ -1,6 +1,6 @@
> " Vim filetype plugin
> " Language:	git send-email message
>-" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
>-" Last Change:	2007 Dec 16
>+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
>+" Last Change:	2009 Dec 24
> 
> runtime! ftplugin/mail.vim
>diff -urN b/runtime/ftplugin/git.vim c/runtime/ftplugin/git.vim
>--- b/runtime/ftplugin/git.vim	2014-06-22 15:49:39.000000000 -0400
>+++ c/runtime/ftplugin/git.vim	2013-05-30 11:04:36.000000000 -0400
>@@ -1,7 +1,7 @@
> " Vim filetype plugin
> " Language:	generic git output
>-" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
>-" Last Change:	2008 Jul 30
>+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
>+" Last Change:	2013 May 30
> 
> " Only do this when not done yet for this buffer
> if (exists("b:did_ftplugin"))
>@@ -10,7 +10,9 @@
> let b:did_ftplugin = 1
> 
> if !exists('b:git_dir')
>-  if expand('%:p') =~# '\.git\>'
>+  if expand('%:p') =~# '[\/]\.git[\/]modules[\/]'
>+    " Stay out of the way
>+  elseif expand('%:p') =~# '\.git\>'
>     let b:git_dir = matchstr(expand('%:p'),'.*\.git\>')
>   elseif $GIT_DIR != ''
>     let b:git_dir = $GIT_DIR
>@@ -29,6 +31,9 @@
> else
>   setlocal keywordprg=git\ show
> endif
>+if has('gui_running')
>+  let &l:keywordprg = substitute(&l:keywordprg,'^git\>','git --no-pager','')
>+endif
> 
> setlocal includeexpr=substitute(v:fname,'^[^/]\\+/','','')
> let b:undo_ftplugin = "setl keywordprg< path< includeexpr<"
>diff -urN b/runtime/indent/gitconfig.vim c/runtime/indent/gitconfig.vim
>--- b/runtime/indent/gitconfig.vim	2014-06-22 15:50:25.000000000 -0400
>+++ c/runtime/indent/gitconfig.vim	2013-05-30 11:04:36.000000000 -0400
>@@ -1,7 +1,7 @@
> " Vim indent file
> " Language:	git config file
>-" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
>-" Last Change:	2008 Jun 04
>+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
>+" Last Change:	2013 May 30
> 
> if exists("b:did_indent")
>   finish
>@@ -12,6 +12,8 @@
> setlocal indentexpr=GetGitconfigIndent()
> setlocal indentkeys=o,O,*<Return>,0[,],0;,0#,=,!^F
> 
>+let b:undo_indent = 'setl ai< inde< indk<'
>+
> " Only define the function once.
> if exists("*GetGitconfigIndent")
>   finish
>diff -urN b/runtime/syntax/gitcommit.vim c/runtime/syntax/gitcommit.vim
>--- b/runtime/syntax/gitcommit.vim	2014-06-22 15:51:10.000000000 -0400
>+++ c/runtime/syntax/gitcommit.vim	2013-05-30 11:04:36.000000000 -0400
>@@ -1,8 +1,8 @@
> " Vim syntax file
> " Language:	git commit file
>-" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
>+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
> " Filenames:	*.git/COMMIT_EDITMSG
>-" Last Change:	2008 Apr 09
>+" Last Change:	2013 May 30
> 
> if exists("b:current_syntax")
>   finish
>@@ -16,48 +16,66 @@
> endif
> 
> syn include @gitcommitDiff syntax/diff.vim
>-syn region gitcommitDiff start=/\%(^diff --git \)\@=/ end=/^$\|^#\@=/ contains=@gitcommitDiff
>+syn region gitcommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|#\)\@=/ fold contains=@gitcommitDiff
> 
> syn match   gitcommitFirstLine	"\%^[^#].*"  nextgroup=gitcommitBlank skipnl
>-syn match   gitcommitSummary  	"^.\{0,50\}" contained containedin=gitcommitFirstLine nextgroup=gitcommitOverflow contains=@Spell
>+syn match   gitcommitSummary	"^.\{0,50\}" contained containedin=gitcommitFirstLine nextgroup=gitcommitOverflow contains=@Spell
> syn match   gitcommitOverflow	".*" contained contains=@Spell
> syn match   gitcommitBlank	"^[^#].*" contained contains=@Spell
> syn match   gitcommitComment	"^#.*"
>-syn region  gitcommitHead	start=/^#   / end=/^#$/ contained transparent
>+syn match   gitcommitHead	"^\%(#   .*\n\)\+#$" contained transparent
> syn match   gitcommitOnBranch	"\%(^# \)\@<=On branch" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite
>-syn match   gitcommitBranch	"\S\+" contained
>+syn match   gitcommitOnBranch	"\%(^# \)\@<=Your branch .\{-\} '" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite
>+syn match   gitcommitBranch	"[^ ']\+" contained
>+syn match   gitcommitNoBranch	"\%(^# \)\@<=Not currently on any branch." contained containedin=gitcommitComment
> syn match   gitcommitHeader	"\%(^# \)\@<=.*:$"	contained containedin=gitcommitComment
>+syn region  gitcommitAuthor	matchgroup=gitCommitHeader start=/\%(^# \)\@<=\%(Author\|Committer\):/ end=/$/ keepend oneline contained containedin=gitcommitComment transparent
>+syn match   gitcommitNoChanges	"\%(^# \)\@<=No changes$" contained containedin=gitcommitComment
> 
> syn region  gitcommitUntracked	start=/^# Untracked files:/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitUntrackedFile fold
> syn match   gitcommitUntrackedFile  "\t\@<=.*"	contained
> 
>-syn region  gitcommitDiscarded	start=/^# Changed but not updated:/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitDiscardedType fold
>+syn region  gitcommitDiscarded	start=/^# Change\%(s not staged for commit\|d but not updated\):/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitDiscardedType fold
> syn region  gitcommitSelected	start=/^# Changes to be committed:/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitSelectedType fold
>+syn region  gitcommitUnmerged	start=/^# Unmerged paths:/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitUnmergedType fold
> 
> syn match   gitcommitDiscardedType	"\t\@<=[a-z][a-z ]*[a-z]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitDiscardedFile skipwhite
> syn match   gitcommitSelectedType	"\t\@<=[a-z][a-z ]*[a-z]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitSelectedFile skipwhite
>+syn match   gitcommitUnmergedType	"\t\@<=[a-z][a-z ]*[a-z]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitUnmergedFile skipwhite
> syn match   gitcommitDiscardedFile	".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitDiscardedArrow
> syn match   gitcommitSelectedFile	".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow
>+syn match   gitcommitUnmergedFile	".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow
> syn match   gitcommitDiscardedArrow	" -> " contained nextgroup=gitcommitDiscardedFile
> syn match   gitcommitSelectedArrow	" -> " contained nextgroup=gitcommitSelectedFile
>+syn match   gitcommitUnmergedArrow	" -> " contained nextgroup=gitcommitSelectedFile
>+
>+syn match   gitcommitWarning		"\%^[^#].*: needs merge$" nextgroup=gitcommitWarning skipnl
>+syn match   gitcommitWarning		"^[^#].*: needs merge$" nextgroup=gitcommitWarning skipnl contained
>+syn match   gitcommitWarning		"^\%(no changes added to commit\|nothing \%(added \)\=to commit\)\>.*\%$"
> 
> hi def link gitcommitSummary		Keyword
> hi def link gitcommitComment		Comment
> hi def link gitcommitUntracked		gitcommitComment
> hi def link gitcommitDiscarded		gitcommitComment
> hi def link gitcommitSelected		gitcommitComment
>+hi def link gitcommitUnmerged		gitcommitComment
> hi def link gitcommitOnBranch		Comment
> hi def link gitcommitBranch		Special
>+hi def link gitcommitNoBranch		gitCommitBranch
> hi def link gitcommitDiscardedType	gitcommitType
> hi def link gitcommitSelectedType	gitcommitType
>+hi def link gitcommitUnmergedType	gitcommitType
> hi def link gitcommitType		Type
>+hi def link gitcommitNoChanges		gitcommitHeader
> hi def link gitcommitHeader		PreProc
> hi def link gitcommitUntrackedFile	gitcommitFile
> hi def link gitcommitDiscardedFile	gitcommitFile
> hi def link gitcommitSelectedFile	gitcommitFile
>+hi def link gitcommitUnmergedFile	gitcommitFile
> hi def link gitcommitFile		Constant
> hi def link gitcommitDiscardedArrow	gitcommitArrow
> hi def link gitcommitSelectedArrow	gitcommitArrow
>+hi def link gitcommitUnmergedArrow	gitcommitArrow
> hi def link gitcommitArrow		gitcommitComment
> "hi def link gitcommitOverflow		Error
> hi def link gitcommitBlank		Error
>diff -urN b/runtime/syntax/gitconfig.vim c/runtime/syntax/gitconfig.vim
>--- b/runtime/syntax/gitconfig.vim	2014-06-22 15:51:20.000000000 -0400
>+++ c/runtime/syntax/gitconfig.vim	2010-05-21 05:40:11.000000000 -0400
>@@ -1,8 +1,8 @@
> " Vim syntax file
> " Language:	git config file
>-" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
>+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
> " Filenames:	gitconfig, .gitconfig, *.git/config
>-" Last Change:	2008 Jun 04
>+" Last Change:	2010 May 21
> 
> if exists("b:current_syntax")
>   finish
>diff -urN b/runtime/syntax/gitrebase.vim c/runtime/syntax/gitrebase.vim
>--- b/runtime/syntax/gitrebase.vim	2014-06-22 15:57:17.000000000 -0400
>+++ c/runtime/syntax/gitrebase.vim	2013-05-30 11:04:36.000000000 -0400
>@@ -1,8 +1,8 @@
> " Vim syntax file
> " Language:	git rebase --interactive
>-" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
>+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
> " Filenames:	git-rebase-todo
>-" Last Change:	2008 Apr 16
>+" Last Change:	2013 May 30
> 
> if exists("b:current_syntax")
>   finish
>@@ -13,17 +13,24 @@
> syn match   gitrebaseHash   "\v<\x{7,40}>"                             contained
> syn match   gitrebaseCommit "\v<\x{7,40}>"  nextgroup=gitrebaseSummary skipwhite
> syn match   gitrebasePick   "\v^p%(ick)=>"   nextgroup=gitrebaseCommit skipwhite
>+syn match   gitrebaseReword "\v^r%(eword)=>" nextgroup=gitrebaseCommit skipwhite
> syn match   gitrebaseEdit   "\v^e%(dit)=>"   nextgroup=gitrebaseCommit skipwhite
> syn match   gitrebaseSquash "\v^s%(quash)=>" nextgroup=gitrebaseCommit skipwhite
>+syn match   gitrebaseFixup  "\v^f%(ixup)=>"  nextgroup=gitrebaseCommit skipwhite
>+syn match   gitrebaseExec   "\v^%(x|exec)>" nextgroup=gitrebaseCommand skipwhite
> syn match   gitrebaseSummary ".*"               contains=gitrebaseHash contained
>+syn match   gitrebaseCommand ".*"                                      contained
> syn match   gitrebaseComment "^#.*"             contains=gitrebaseHash
>-syn match   gitrebaseSquashError "\v%^s%(quash)=>" nextgroup=gitrebaseCommit skipwhite
>+syn match   gitrebaseSquashError "\v%^%(s%(quash)=>|f%(ixup)=>)" nextgroup=gitrebaseCommit skipwhite
> 
> hi def link gitrebaseCommit         gitrebaseHash
> hi def link gitrebaseHash           Identifier
> hi def link gitrebasePick           Statement
>+hi def link gitrebaseReword         Number
> hi def link gitrebaseEdit           PreProc
> hi def link gitrebaseSquash         Type
>+hi def link gitrebaseFixup          Special
>+hi def link gitrebaseExec           Function
> hi def link gitrebaseSummary        String
> hi def link gitrebaseComment        Comment
> hi def link gitrebaseSquashError    Error
>diff -urN b/runtime/syntax/gitsendemail.vim c/runtime/syntax/gitsendemail.vim
>--- b/runtime/syntax/gitsendemail.vim	2014-06-22 15:51:48.000000000 -0400
>+++ c/runtime/syntax/gitsendemail.vim	2010-05-21 05:41:44.000000000 -0400
>@@ -2,7 +2,7 @@
> " Language:	git send-email message
> " Maintainer:	Tim Pope
> " Filenames:	*.msg.[0-9]* (first line is "From ... # This line is ignored.")
>-" Last Change:	2007 Dec 16
>+" Last Change:	2010 May 21
> 
> if exists("b:current_syntax")
>   finish
>diff -urN b/runtime/syntax/git.vim c/runtime/syntax/git.vim
>--- b/runtime/syntax/git.vim	2014-06-22 15:55:15.000000000 -0400
>+++ c/runtime/syntax/git.vim	2010-05-21 05:43:24.000000000 -0400
>@@ -1,7 +1,7 @@
> " Vim syntax file
> " Language:	generic git output
>-" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
>-" Last Change:	2008 Mar 21
>+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
>+" Last Change:	2010 May 21
> 
> if exists("b:current_syntax")
>   finish
>@@ -13,14 +13,19 @@
> syn include @gitDiff syntax/diff.vim
> 
> syn region gitHead start=/\%^/ end=/^$/
>-syn region gitHead start=/\%(^commit \x\{40\}$\)\@=/ end=/^$/
>+syn region gitHead start=/\%(^commit \x\{40\}\%(\s*(.*)\)\=$\)\@=/ end=/^$/
> 
> " For git reflog and git show ...^{tree}, avoid sync issues
> syn match gitHead /^\d\{6\} \%(\w\{4} \)\=\x\{40\}\%( [0-3]\)\=\t.*/
> syn match gitHead /^\x\{40\} \x\{40}\t.*/
> 
>-syn region gitDiff start=/^\%(diff --git \)\@=/ end=/^\%(diff --git \|$\)\@=/ contains=@gitDiff fold
>-syn region gitDiff start=/^\%(@@ -\)\@=/ end=/^\%(diff --git \|$\)\@=/ contains=@gitDiff
>+syn region gitDiff start=/^\%(diff --git \)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff fold
>+syn region gitDiff start=/^\%(@@ -\)\@=/ end=/^\%(diff --\%(git\|cc\|combined\) \|$\)\@=/ contains=@gitDiff
>+
>+syn region gitDiffMerge start=/^\%(diff --\%(cc\|combined\) \)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff
>+syn region gitDiffMerge start=/^\%(@@@@* -\)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff
>+syn match gitDiffAdded "^ \++.*" contained containedin=gitDiffMerge
>+syn match gitDiffRemoved "^ \+-.*" contained containedin=gitDiffMerge
> 
> syn match  gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\|encoding\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite
> syn match  gitKeyword /^\%(tag\>\|ref:\)/ contained containedin=gitHead nextgroup=gitReference skipwhite
>@@ -29,8 +34,6 @@
> syn match  gitIdentityKeyword /^\%(author\|committer\|tagger\)\>/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
> syn match  gitIdentityHeader /^\%(Author\|Commit\|Tagger\):/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
> syn match  gitDateHeader /^\%(AuthorDate\|CommitDate\|Date\):/ contained containedin=gitHead nextgroup=gitDate skipwhite
>-syn match  gitIdentity /\S.\{-\} <[^>]*>/ contained nextgroup=gitDate skipwhite
>-syn region gitEmail matchgroup=gitEmailDelimiter start=/</ end=/>/ keepend oneline contained containedin=gitIdentity
> 
> syn match  gitReflogHeader /^Reflog:/ contained containedin=gitHead nextgroup=gitReflogMiddle skipwhite
> syn match  gitReflogHeader /^Reflog message:/ contained containedin=gitHead skipwhite
>@@ -42,14 +45,20 @@
> syn match  gitType      /\<\%(tag\|commit\|tree\|blob\)\>/     contained nextgroup=gitHash skipwhite
> syn match  gitStage     /\<\d\t\@=/                            contained
> syn match  gitReference /\S\+\S\@!/                            contained
>-syn match  gitHash      /\<\x\{40\}\>/                         contained nextgroup=gitIdentity,gitStage skipwhite
>+syn match  gitHash      /\<\x\{40\}\>/                         contained nextgroup=gitIdentity,gitStage,gitHash skipwhite
> syn match  gitHash      /^\<\x\{40\}\>/ containedin=gitHead contained nextgroup=gitHash skipwhite
>+syn match  gitHashAbbrev /\<\x\{4,40\}\>/           contained nextgroup=gitHashAbbrev skipwhite
> syn match  gitHashAbbrev /\<\x\{4,39\}\.\.\./he=e-3 contained nextgroup=gitHashAbbrev skipwhite
>-syn match  gitHashAbbrev /\<\x\{40\}\>/             contained nextgroup=gitHashAbbrev skipwhite
>+
>+syn match  gitIdentity /\S.\{-\} <[^>]*>/ contained nextgroup=gitDate skipwhite
>+syn region gitEmail matchgroup=gitEmailDelimiter start=/</ end=/>/ keepend oneline contained containedin=gitIdentity
>+
>+syn match  gitNotesHeader /^Notes:\ze\n    /
> 
> hi def link gitDateHeader        gitIdentityHeader
> hi def link gitIdentityHeader    gitIdentityKeyword
> hi def link gitIdentityKeyword   Label
>+hi def link gitNotesHeader       gitKeyword
> hi def link gitReflogHeader      gitKeyword
> hi def link gitKeyword           Keyword
> hi def link gitIdentity          String
>@@ -63,5 +72,7 @@
> hi def link gitReference         Function
> hi def link gitStage             gitType
> hi def link gitType              Type
>+hi def link gitDiffAdded         diffAdded
>+hi def link gitDiffRemoved       diffRemoved
> 
> let b:current_syntax = "git"

Actions: View | Diff

Attachments on bug 1112441: 911607 | 911608 | 911609