Cleanup C/C++ syntax files

syntax/cpp.vim

@@ -1,7 +1,5 @@
-" Language:	C++
-" Description:
-" Current Maintainer:	Kenneth Benzie (Benie) <k.benzie83@gmail.com>
-" Created: December 23, 2016
+" Language: C++
+" Description: Override default C++ syntax file.
 
 " Quit when a syntax file was already loaded
 if exists('b:current_syntax')
@@ -15,7 +13,6 @@ let b:c_no_cformat = 1
 let b:c_no_c11 = 1
 let b:c_no_ansi = 1
 let b:c_no_bsd = 1
-let b:c_gnu = 0
 let b:c_no_operators = 1
 
 " Read the C syntax to start with
@@ -28,8 +25,7 @@ syn keyword cppAccess public protected private
 syn keyword cppModifier inline virtual explicit export
 syn keyword cppType bool wchar_t
 syn keyword cppExceptions throw try catch
-syn keyword cppOperator new delete typeid and bitor or xor compl bitand and_eq
-      \ or_eq xor_eq not not_eq
+syn keyword cppOperator new delete typeid and bitor or xor compl bitand and_eq or_eq xor_eq not not_eq
 if exists('c_no_operators')
   syn keyword cppOperator operator
 endif
@@ -73,7 +69,7 @@ if !exists('cpp_no_delimiters')
 
   " Match: label: as a Label and public: protected: private: as a Statement
   "        ^^^^^                 ^^^^^^  ^^^^^^^^^  ^^^^^^^
-  syn match cUserCont "^\s*\I\i*\s*:$" contains=cppAccess display
+  syn match cUserCont "^\s*\I\i*\s*:$" contains=cUserLabel,cppAccess display
 
   hi default link cppDelimiter cDelimiter
   hi default link cppNestedName cInclude
@@ -112,5 +108,3 @@ hi def link cppRawString String
 hi def link cppNumber Number
 
 let b:current_syntax = 'cpp'
-
-" vim: ts=8