diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-12-10 21:11:27 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-12-10 21:11:27 +0100 |
commit | 1b884a0053982335f644eec6c71027706bf3c522 (patch) | |
tree | 711868d7876566aae13c9b803c5a92e0d3d42329 /runtime/syntax | |
parent | 70249ee831df357c1a5475473fc84c40d101a67d (diff) | |
download | vim-git-1b884a0053982335f644eec6c71027706bf3c522.tar.gz |
Update runtime files.
Diffstat (limited to 'runtime/syntax')
-rw-r--r-- | runtime/syntax/aidl.vim | 4 | ||||
-rw-r--r-- | runtime/syntax/diff.vim | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/runtime/syntax/aidl.vim b/runtime/syntax/aidl.vim index 1947ab97d..3a79433aa 100644 --- a/runtime/syntax/aidl.vim +++ b/runtime/syntax/aidl.vim @@ -2,7 +2,7 @@ " Language: aidl (Android Interface Definition Language) " https://developer.android.com/guide/components/aidl " Maintainer: Dominique Pelle <dominique.pelle@tomtom.com> -" LastChange: 2020/07/25 +" LastChange: 2020/12/03 " Quit when a syntax file was already loaded. if exists("b:current_syntax") @@ -12,7 +12,7 @@ endif source <sfile>:p:h/java.vim syn keyword aidlParamDir in out inout -syn keyword aidlKeyword oneway parcelable +syn keyword aidlKeyword const oneway parcelable " Needed for the 'in', 'out', 'inout' keywords to be highlighted. syn cluster javaTop add=aidlParamDir diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim index b656cd97a..ac43d6650 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 07 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -346,9 +346,11 @@ syn match diffLine "^---$" syn match diffLine "^\d\+\(,\d\+\)\=[cda]\d\+\>.*" syn match diffFile "^diff\>.*" -syn match diffFile "^+++ .*" syn match diffFile "^Index: .*" syn match diffFile "^==== .*" +" Old style diff uses *** for old and --- for new. +" Unified diff uses --- for old and +++ for new; names are wrong but it works. +syn match diffOldFile "^+++ .*" syn match diffOldFile "^\*\*\* .*" syn match diffNewFile "^--- .*" |