diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-01 19:29:13 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-05-01 22:29:03 -0400 |
| commit | 710f0eae2f5a626a0771acbb1fb32e121bbf2bde (patch) | |
| tree | aaf2e66ce8a83e9efa07048b768be8b95b6b51e3 /runtime/syntax | |
| parent | 83b6a18598a76730d546beebb1951054611344e5 (diff) | |
| download | rneovim-710f0eae2f5a626a0771acbb1fb32e121bbf2bde.tar.gz rneovim-710f0eae2f5a626a0771acbb1fb32e121bbf2bde.tar.bz2 rneovim-710f0eae2f5a626a0771acbb1fb32e121bbf2bde.zip | |
vim-patch:1b884a005398
Update runtime files.
https://github.com/vim/vim/commit/1b884a0053982335f644eec6c71027706bf3c522
Omit doc/autocmd.txt.
Omit tools/emoji_list.vim. Patch v8.2.1540 is not ported.
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 1947ab97d8..3a79433aa9 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 b656cd97a6..ac43d6650a 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 "^--- .*" |