Blame SOURCES/vim-7.4-c++11.patch

8b9a1c
diff -up vim74/runtime/syntax/cpp.vim.c++11 vim74/runtime/syntax/cpp.vim
8b9a1c
--- vim74/runtime/syntax/cpp.vim.c++11	2017-08-23 17:49:00.722250142 +0200
8b9a1c
+++ vim74/runtime/syntax/cpp.vim	2017-08-23 17:49:29.132979711 +0200
8b9a1c
@@ -1,29 +1,23 @@
8b9a1c
 " Vim syntax file
8b9a1c
 " Language:	C++
8b9a1c
-" Current Maintainer:	vim-jp (https://github.com/vim-jp/cpp-vim)
8b9a1c
+" Current Maintainer:	vim-jp (https://github.com/vim-jp/vim-cpp)
8b9a1c
 " Previous Maintainer:	Ken Shan <ccshan@post.harvard.edu>
8b9a1c
-" Last Change:	2012 Jun 14
8b9a1c
+" Last Change:	2017 Jun 05
8b9a1c
 
8b9a1c
-" For version 5.x: Clear all syntax items
8b9a1c
-" For version 6.x: Quit when a syntax file was already loaded
8b9a1c
-if version < 600
8b9a1c
-  syntax clear
8b9a1c
-elseif exists("b:current_syntax")
8b9a1c
+" quit when a syntax file was already loaded
8b9a1c
+if exists("b:current_syntax")
8b9a1c
   finish
8b9a1c
 endif
8b9a1c
 
8b9a1c
 " Read the C syntax to start with
8b9a1c
-if version < 600
8b9a1c
-  so <sfile>:p:h/c.vim
8b9a1c
-else
8b9a1c
-  runtime! syntax/c.vim
8b9a1c
-  unlet b:current_syntax
8b9a1c
-endif
8b9a1c
+runtime! syntax/c.vim
8b9a1c
+unlet b:current_syntax
8b9a1c
 
8b9a1c
 " C++ extensions
8b9a1c
 syn keyword cppStatement	new delete this friend using
8b9a1c
 syn keyword cppAccess		public protected private
8b9a1c
-syn keyword cppType		inline virtual explicit export bool wchar_t
8b9a1c
+syn keyword cppModifier		inline virtual explicit export
8b9a1c
+syn keyword cppType		bool wchar_t
8b9a1c
 syn keyword cppExceptions	throw try catch
8b9a1c
 syn keyword cppOperator		operator typeid
8b9a1c
 syn keyword cppOperator		and bitor or xor compl bitand and_eq or_eq xor_eq not not_eq
8b9a1c
@@ -32,38 +26,51 @@ syn match cppCast		"\<\(const\|static\|d
8b9a1c
 syn keyword cppStorageClass	mutable
8b9a1c
 syn keyword cppStructure	class typename template namespace
8b9a1c
 syn keyword cppBoolean		true false
8b9a1c
+syn keyword cppConstant		__cplusplus
8b9a1c
 
8b9a1c
 " C++ 11 extensions
8b9a1c
 if !exists("cpp_no_cpp11")
8b9a1c
-  syn keyword cppType		override final
8b9a1c
+  syn keyword cppModifier	override final
8b9a1c
+  syn keyword cppType		nullptr_t auto
8b9a1c
   syn keyword cppExceptions	noexcept
8b9a1c
-  syn keyword cppStorageClass	constexpr decltype
8b9a1c
+  syn keyword cppStorageClass	constexpr decltype thread_local
8b9a1c
   syn keyword cppConstant	nullptr
8b9a1c
+  syn keyword cppConstant	ATOMIC_FLAG_INIT ATOMIC_VAR_INIT
8b9a1c
+  syn keyword cppConstant	ATOMIC_BOOL_LOCK_FREE ATOMIC_CHAR_LOCK_FREE
8b9a1c
+  syn keyword cppConstant	ATOMIC_CHAR16_T_LOCK_FREE ATOMIC_CHAR32_T_LOCK_FREE
8b9a1c
+  syn keyword cppConstant	ATOMIC_WCHAR_T_LOCK_FREE ATOMIC_SHORT_LOCK_FREE
8b9a1c
+  syn keyword cppConstant	ATOMIC_INT_LOCK_FREE ATOMIC_LONG_LOCK_FREE
8b9a1c
+  syn keyword cppConstant	ATOMIC_LLONG_LOCK_FREE ATOMIC_POINTER_LOCK_FREE
8b9a1c
+  syn region cppRawString	matchgroup=cppRawStringDelimiter start=+\%(u8\|[uLU]\)\=R"\z([[:alnum:]_{}[\]#<>%:;.?*\+\-/\^&|~!=,"']\{,16}\)(+ end=+)\z1"+ contains=@Spell
8b9a1c
+endif
8b9a1c
+
8b9a1c
+" C++ 14 extensions
8b9a1c
+if !exists("cpp_no_cpp14")
8b9a1c
+  syn case ignore
8b9a1c
+  syn match cppNumber		display "\<0b[01]\('\=[01]\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
8b9a1c
+  syn match cppNumber		display "\<[1-9]\('\=\d\+\)*\(u\=l\{0,2}\|ll\=u\)\>" contains=cFloat
8b9a1c
+  syn match cppNumber		display "\<0x\x\('\=\x\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
8b9a1c
+  syn case match
8b9a1c
 endif
8b9a1c
 
8b9a1c
 " The minimum and maximum operators in GNU C++
8b9a1c
 syn match cppMinMax "[<>]?"
8b9a1c
 
8b9a1c
 " Default highlighting
8b9a1c
-if version >= 508 || !exists("did_cpp_syntax_inits")
8b9a1c
-  if version < 508
8b9a1c
-    let did_cpp_syntax_inits = 1
8b9a1c
-    command -nargs=+ HiLink hi link <args>
8b9a1c
-  else
8b9a1c
-    command -nargs=+ HiLink hi def link <args>
8b9a1c
-  endif
8b9a1c
-  HiLink cppAccess		cppStatement
8b9a1c
-  HiLink cppCast		cppStatement
8b9a1c
-  HiLink cppExceptions		Exception
8b9a1c
-  HiLink cppOperator		Operator
8b9a1c
-  HiLink cppStatement		Statement
8b9a1c
-  HiLink cppType		Type
8b9a1c
-  HiLink cppStorageClass	StorageClass
8b9a1c
-  HiLink cppStructure		Structure
8b9a1c
-  HiLink cppBoolean		Boolean
8b9a1c
-  HiLink cppConstant		Constant
8b9a1c
-  delcommand HiLink
8b9a1c
-endif
8b9a1c
+hi def link cppAccess		cppStatement
8b9a1c
+hi def link cppCast		cppStatement
8b9a1c
+hi def link cppExceptions		Exception
8b9a1c
+hi def link cppOperator		Operator
8b9a1c
+hi def link cppStatement		Statement
8b9a1c
+hi def link cppModifier		Type
8b9a1c
+hi def link cppType		Type
8b9a1c
+hi def link cppStorageClass	StorageClass
8b9a1c
+hi def link cppStructure		Structure
8b9a1c
+hi def link cppBoolean		Boolean
8b9a1c
+hi def link cppConstant		Constant
8b9a1c
+hi def link cppRawStringDelimiter	Delimiter
8b9a1c
+hi def link cppRawString		String
8b9a1c
+hi def link cppNumber		Number
8b9a1c
 
8b9a1c
 let b:current_syntax = "cpp"
8b9a1c