summaryrefslogtreecommitdiff
path: root/runtime/syntax/cpp.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-03-19 11:35:58 +0100
committerBram Moolenaar <Bram@vim.org>2013-03-19 11:35:58 +0100
commitac7bd63844fdc6696a48b69d7a42e23e30245980 (patch)
tree00fa78b483597a152d53c2b10b90c0ea76761ab3 /runtime/syntax/cpp.vim
parentb897871ce9a4a6bd033bfe127a83eb6348361739 (diff)
downloadvim-git-ac7bd63844fdc6696a48b69d7a42e23e30245980.tar.gz
Update runtime files.
Diffstat (limited to 'runtime/syntax/cpp.vim')
-rw-r--r--runtime/syntax/cpp.vim18
1 files changed, 13 insertions, 5 deletions
diff --git a/runtime/syntax/cpp.vim b/runtime/syntax/cpp.vim
index feb89ee61..ec95020e2 100644
--- a/runtime/syntax/cpp.vim
+++ b/runtime/syntax/cpp.vim
@@ -1,7 +1,8 @@
" Vim syntax file
" Language: C++
-" Maintainer: Ken Shan <ccshan@post.harvard.edu>
-" Last Change: 2002 Jul 15
+" Current Maintainer: vim-jp (https://github.com/vim-jp/cpp-vim)
+" Previous Maintainer: Ken Shan <ccshan@post.harvard.edu>
+" Last Change: 2012 Jun 14
" For version 5.x: Clear all syntax items
" For version 6.x: Quit when a syntax file was already loaded
@@ -19,7 +20,7 @@ else
unlet b:current_syntax
endif
-" C++ extentions
+" C++ extensions
syn keyword cppStatement new delete this friend using
syn keyword cppAccess public protected private
syn keyword cppType inline virtual explicit export bool wchar_t
@@ -30,9 +31,16 @@ syn match cppCast "\<\(const\|static\|dynamic\|reinterpret\)_cast\s*<"me=e-1
syn match cppCast "\<\(const\|static\|dynamic\|reinterpret\)_cast\s*$"
syn keyword cppStorageClass mutable
syn keyword cppStructure class typename template namespace
-syn keyword cppNumber NPOS
syn keyword cppBoolean true false
+" C++ 11 extensions
+if !exists("cpp_no_cpp11")
+ syn keyword cppType override final
+ syn keyword cppExceptions noexcept
+ syn keyword cppStorageClass constexpr decltype
+ syn keyword cppConstant nullptr
+endif
+
" The minimum and maximum operators in GNU C++
syn match cppMinMax "[<>]?"
@@ -52,8 +60,8 @@ if version >= 508 || !exists("did_cpp_syntax_inits")
HiLink cppType Type
HiLink cppStorageClass StorageClass
HiLink cppStructure Structure
- HiLink cppNumber Number
HiLink cppBoolean Boolean
+ HiLink cppConstant Constant
delcommand HiLink
endif