diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-29 14:59:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-29 14:59:10 +0200 |
commit | 5a304b78647d1a3913cbab197ccde033ae0510cd (patch) | |
tree | 654eb1c155b568745309646e79b970e011527577 /runtime/syntax/cpp.vim | |
parent | 51a2d8dc36b56125c81a085a773eb47671eec7f0 (diff) | |
parent | 024ff6b80831a27d2f6571006eb6fdf94d95f882 (diff) | |
download | rneovim-5a304b78647d1a3913cbab197ccde033ae0510cd.tar.gz rneovim-5a304b78647d1a3913cbab197ccde033ae0510cd.tar.bz2 rneovim-5a304b78647d1a3913cbab197ccde033ae0510cd.zip |
Merge #6615 from justinmk/vim-patches
Diffstat (limited to 'runtime/syntax/cpp.vim')
-rw-r--r-- | runtime/syntax/cpp.vim | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/runtime/syntax/cpp.vim b/runtime/syntax/cpp.vim index d669206b3e..5a478fb77d 100644 --- a/runtime/syntax/cpp.vim +++ b/runtime/syntax/cpp.vim @@ -2,7 +2,7 @@ " Language: C++ " Current Maintainer: vim-jp (https://github.com/vim-jp/vim-cpp) " Previous Maintainer: Ken Shan <ccshan@post.harvard.edu> -" Last Change: 2016 Jul 07 +" Last Change: 2016 Oct 28 " quit when a syntax file was already loaded if exists("b:current_syntax") @@ -31,7 +31,7 @@ syn keyword cppConstant __cplusplus " C++ 11 extensions if !exists("cpp_no_cpp11") syn keyword cppModifier override final - syn keyword cppType nullptr_t + syn keyword cppType nullptr_t auto syn keyword cppExceptions noexcept syn keyword cppStorageClass constexpr decltype thread_local syn keyword cppConstant nullptr @@ -46,7 +46,11 @@ endif " C++ 14 extensions if !exists("cpp_no_cpp14") - syn match cppNumber display "\<0b[01]\+\(u\=l\{0,2}\|ll\=u\)\>" + syn case ignore + syn match cppNumber display "\<0b[01]\('\=[01]\+\)*\(u\=l\{0,2}\|ll\=u\)\>" + syn match cppNumber display "\<[1-9]\('\=\d\+\)*\(u\=l\{0,2}\|ll\=u\)\>" + syn match cppNumber display "\<0x\x\('\=\x\+\)*\(u\=l\{0,2}\|ll\=u\)\>" + syn case match endif " The minimum and maximum operators in GNU C++ |