diff options
Diffstat (limited to 'vim71/syntax/diff.vim')
| -rw-r--r-- | vim71/syntax/diff.vim | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/vim71/syntax/diff.vim b/vim71/syntax/diff.vim new file mode 100644 index 0000000..8ec6880 --- /dev/null +++ b/vim71/syntax/diff.vim @@ -0,0 +1,63 @@ +" Vim syntax file +" Language: Diff (context or unified) +" Maintainer: Bram Moolenaar <Bram@vim.org> +" Last Change: 2005 Jun 20 + +" Quit when a (custom) syntax file was already loaded +if exists("b:current_syntax") + finish +endif + +syn match diffOnly "^Only in .*" +syn match diffIdentical "^Files .* and .* are identical$" +syn match diffDiffer "^Files .* and .* differ$" +syn match diffBDiffer "^Binary files .* and .* differ$" +syn match diffIsA "^File .* is a .* while file .* is a .*" +syn match diffNoEOL "^No newline at end of file .*" +syn match diffCommon "^Common subdirectories: .*" + +syn match diffRemoved "^-.*" +syn match diffRemoved "^<.*" +syn match diffAdded "^+.*" +syn match diffAdded "^>.*" +syn match diffChanged "^! .*" + +syn match diffSubname " @@..*"ms=s+3 contained +syn match diffLine "^@.*" contains=diffSubname +syn match diffLine "^\<\d\+\>.*" +syn match diffLine "^\*\*\*\*.*" + +"Some versions of diff have lines like "#c#" and "#d#" (where # is a number) +syn match diffLine "^\d\+\(,\d\+\)\=[cda]\d\+\>.*" + +syn match diffFile "^diff.*" +syn match diffFile "^+++ .*" +syn match diffFile "^Index: .*$" +syn match diffFile "^==== .*$" +syn match diffOldFile "^\*\*\* .*" +syn match diffNewFile "^--- .*" + +syn match diffComment "^#.*" + +" Define the default highlighting. +" Only used when an item doesn't have highlighting yet +hi def link diffOldFile diffFile +hi def link diffNewFile diffFile +hi def link diffFile Type +hi def link diffOnly Constant +hi def link diffIdentical Constant +hi def link diffDiffer Constant +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 diffLine Statement +hi def link diffSubname PreProc +hi def link diffComment Comment + +let b:current_syntax = "diff" + +" vim: ts=8 sw=2 |