rebase to the upstream to remove conflicts

Author: pryrt

UDLs/C3_by_gabrielezed.xml

@@ -25,8 +25,8 @@
             <Keywords name="Folders in comment, open"></Keywords>
             <Keywords name="Folders in comment, middle"></Keywords>
             <Keywords name="Folders in comment, close"></Keywords>
-            <Keywords name="Keywords1">alias asm assert attrdef bitstruct break case catch const continue def default defer distinct do else enum extern false fault tlocal for foreach foreach_r fn if inline import macro module nextcase null interface return static struct switch true try union var while</Keywords>
-            <Keywords name="Keywords2">void bool char double float float16 bfloat int128 ichar int iptr isz long short uint128 uint ulong uptr ushort usz float128 any typeid String ZString WString DString</Keywords>
+            <Keywords name="Keywords1">alias asm assert attrdef bitstruct break case catch const constdef continue default defer do else enum extern false fault faultdef tlocal for foreach foreach_r fn if inline import macro module nextcase null interface return static struct switch true try typedef union var while</Keywords>
+            <Keywords name="Keywords2">void bool char double float float16 bfloat16 int128 ichar int iptr isz sz long short uint128 uint ulong uptr ushort usz float128 any typeid String ZString WString DString</Keywords>
             <Keywords name="Keywords3">$</Keywords>
             <Keywords name="Keywords4">@</Keywords>
             <Keywords name="Keywords5"></Keywords>