diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-10-08 17:07:20 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-10-08 17:17:43 +0200 |
| commit | 19840728228f66c7f2af88dfc4bcecc26ffa064b (patch) | |
| tree | 1b86d1d337ec9a97908d4b8bf3d48f4c439e54a6 /runtime/syntax/diff.vim | |
| parent | 31f6334aa8f8093ddfd2fd3ecf9fc438ad62a792 (diff) | |
| parent | 7bc86b2bbc6800bc47a981ce86c906259020aa70 (diff) | |
| download | rneovim-19840728228f66c7f2af88dfc4bcecc26ffa064b.tar.gz rneovim-19840728228f66c7f2af88dfc4bcecc26ffa064b.tar.bz2 rneovim-19840728228f66c7f2af88dfc4bcecc26ffa064b.zip | |
Merge #5428 'vim-patch: 0c1ff16, 939a1ab, 8067a64'.
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 885feaebdd..b656cd97a6 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 |