diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-04 19:18:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-04 19:18:16 -0400 |
| commit | 4ad30f775e5564c539324b4818886f067d2ecd99 (patch) | |
| tree | 97a554379bda7e5fc77e58c690db3f5a72db8c74 /runtime/syntax/diff.vim | |
| parent | 63d8a8f4e8b02e524d85aed08aa16c5d9815598c (diff) | |
| parent | d5b063aec1db95704b37a77fdbd968cb6b48cc3b (diff) | |
| download | rneovim-4ad30f775e5564c539324b4818886f067d2ecd99.tar.gz rneovim-4ad30f775e5564c539324b4818886f067d2ecd99.tar.bz2 rneovim-4ad30f775e5564c539324b4818886f067d2ecd99.zip | |
Merge pull request #14424 from janlazo/vim-8.1.1726
vim-patch:8.1.1726,8.2.{296,860,1827,2388,2788,2790,2801}
Diffstat (limited to 'runtime/syntax/diff.vim')
| -rw-r--r-- | runtime/syntax/diff.vim | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim index b656cd97a6..408556ac13 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: 2016 Apr 02 +" Last Change: 2020 Dec 30 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -346,11 +346,18 @@ syn match diffLine "^---$" 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 "^--- .*" + +if search('^@@ -\S\+ +\S\+ @@', 'nw', '', 100) + " unified + syn match diffOldFile "^--- .*" + syn match diffNewFile "^+++ .*" +else + " context / old style + syn match diffOldFile "^\*\*\* .*" + syn match diffNewFile "^--- .*" +endif " Used by git syn match diffIndexLine "^index \x\x\x\x.*" |