diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-04-10 01:31:25 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-04-10 01:31:25 +0200 |
commit | 939a1abe935a539f2d4c90a56cb0682cbaf3bbb0 (patch) | |
tree | 1c61c06f7844c15d473095f16a168b0ec5f6fb66 /runtime/syntax/diff.vim | |
parent | a4d13de8363abf4c12fe99a52b4e49e763de92fe (diff) | |
download | vim-git-939a1abe935a539f2d4c90a56cb0682cbaf3bbb0.tar.gz |
Updated runtime files.
Diffstat (limited to 'runtime/syntax/diff.vim')
-rw-r--r-- | runtime/syntax/diff.vim | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim index 885feaebd..b656cd97a 100644 --- a/runtime/syntax/diff.vim +++ b/runtime/syntax/diff.vim @@ -2,7 +2,7 @@ " Language: Diff (context or unified) " Maintainer: Bram Moolenaar <Bram@vim.org> " Translations by Jakson Alves de Aquino. -" Last Change: 2015 Feb 03 +" Last Change: 2016 Apr 02 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -342,7 +342,7 @@ syn match diffLine "^\<\d\+\>.*" syn match diffLine "^\*\*\*\*.*" syn match diffLine "^---$" -"Some versions of diff have lines like "#c#" and "#d#" (where # is a number) +" 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\>.*" @@ -352,12 +352,16 @@ syn match diffFile "^==== .*" syn match diffOldFile "^\*\*\* .*" syn match diffNewFile "^--- .*" +" Used by git +syn match diffIndexLine "^index \x\x\x\x.*" + 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 diffIndexLine PreProc hi def link diffFile Type hi def link diffOnly Constant hi def link diffIdentical Constant |