Index: vim/syntax/objc.vim
==================================================================
--- vim/syntax/objc.vim
+++ vim/syntax/objc.vim
@@ -28,14 +28,17 @@
 " and uses *.h, *.m as file extensions!
 
 
 " ObjC keywords, types, type qualifiers etc.
 syn keyword objcStatement	self super _cmd
-syn keyword objcType		id Class SEL IMP BOOL nonnull nullable
+syn keyword objcType		id Class SEL IMP BOOL
+syn keyword objcType		nonnull nullable null_unspecified
 syn keyword objcTypeModifier	bycopy in out inout oneway OF_GENERIC OF_INLINE
-syn keyword objcTypeModifier	OF_CONST_FUNC OF_NO_RETURN
+syn keyword objcTypeModifier	OF_KINDOF OF_CONST_FUNC OF_NO_RETURN
 syn keyword objcTypeModifier	OF_RETURNS_INNER_POINTER OF_NULLABLE_PROPERTY
+syn keyword objcTypeModifier	OF_NULL_RESETTABLE_PROPERTY OF_UNAVAILABLE
+syn keyword objcTypeModifier	OF_DESIGNATED_INITIALIZER OF_METHOD_FAMILY
 syn keyword objcTypeModifier	_Nonnull _Nullable _Null_unspecified __kindof
 syn keyword objcConstant	nil Nil
 
 " Match the ObjC #import directive (like C's #include)
 syn region objcImported display contained start=+"+  skip=+\\\\\|\\"+  end=+"+
@@ -116,11 +119,12 @@
 "		Some modifications by Jonathan Schleifer <js@webkeks.org>
 " Description:  Better syntax highlighting for Objective-C files (part of the
 "               cocoa.vim plugin).
 " Last Updated: May 3, 2015
 
-syn match objcDirective '@synthesize\|@property\|@optional\|@required\|@autoreleasepool' display
+syn match objcDirective '@synthesize\|@dynamic\|@property' display
+syn match objcDirective '@optional\|@required\|@autoreleasepool' display
 syn keyword objcType IBOutlet IBAction Method __block instancetype
 syn keyword objcType __unsafe_unretained __bridge __bridge_retained __bridge_transfer __autoreleasing __strong __weak
 syn keyword objcType of_unichar_t of_char16_t of_char32_t of_comparison_result_t
 syn keyword objcType of_byte_order_t of_range_t of_point_t of_dimension_t
 syn keyword objcType of_mutex_t of_rmutex_t of_rectangle_t of_string_encoding_t

Index: vimrc
==================================================================
--- vimrc
+++ vimrc
@@ -1,6 +1,6 @@
-source /usr/share/vim/vim73/vimrc_example.vim
+source /usr/share/vim/vim74/vimrc_example.vim
 
 set t_Co=256
 set background=dark
 let g:inkpot_black_background=1
 colorscheme inkpot
@@ -19,11 +19,12 @@
 au BufNewFile,BufRead */haiku/* :se ts=4 sw=4
 au BufNewFile,BufRead */LLVM/* :se ts=2 sw=2 et
 au BufNewFile,BufRead *.c :se ft=c.doxygen
 au BufNewFile,BufRead *.h :se ft=objc.doxygen
 au BufNewFile,BufRead *.m :se ft=objc.doxygen
+au BufNewFile,BufRead *.mm :se ft=objcpp
 au BufNewFile,BufRead *.v :se ts=4 sw=4
 au BufNewFile,BufRead *.vhd :se ts=4 sw=4
 au BufNewFile,BufRead *.py :se ts=4 sw=4 et
 au BufNewFile,BufRead *.cs :se ts=4 sw=4
 au BufNewFile,BufRead *.pas :se ts=2 sw=2 et
 au BufNewFile,BufRead *.rb :se ts=2 sw=2 et