aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax/objcpp.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-04-28 21:06:44 +0200
committerJustin M. Keyes <justinkz@gmail.com>2017-04-28 21:13:55 +0200
commita53409b564458f7a94c8fcd0725d1953dee58dce (patch)
tree27bf0fa5f804d33455b66814c62a0f3358809d1b /runtime/syntax/objcpp.vim
parentf09651ea78b833d6d05db89c41df603b741ab000 (diff)
downloadrneovim-a53409b564458f7a94c8fcd0725d1953dee58dce.tar.gz
rneovim-a53409b564458f7a94c8fcd0725d1953dee58dce.tar.bz2
rneovim-a53409b564458f7a94c8fcd0725d1953dee58dce.zip
vim-patch:89bcfda6834a
Updated runtime files. Remove version checks for Vim older than 6.0. https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
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 e80eed900d..f11e307444 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