summaryrefslogtreecommitdiff
path: root/runtime/syntax/objcpp.vim
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/syntax/objcpp.vim')
-rw-r--r--runtime/syntax/objcpp.vim18
1 files changed, 5 insertions, 13 deletions
diff --git a/runtime/syntax/objcpp.vim b/runtime/syntax/objcpp.vim
index e80eed900..f11e30744 100644
--- a/runtime/syntax/objcpp.vim
+++ b/runtime/syntax/objcpp.vim
@@ -4,23 +4,15 @@
" Ex-Maintainer: Anthony Hodsdon <ahodsdon@fastmail.fm>
" Last Change: 2007 Oct 29
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
finish
endif
" Read in C++ and ObjC syntax files
-if version < 600
- so <sfile>:p:h/cpp.vim
- so <sfile>:p:h/objc.vim
-else
- runtime! syntax/cpp.vim
- unlet b:current_syntax
- runtime! syntax/objc.vim
-endif
+runtime! syntax/cpp.vim
+unlet b:current_syntax
+runtime! syntax/objc.vim
syn keyword objCppNonStructure class template namespace transparent contained
syn keyword objCppNonStatement new delete friend using transparent contained