diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-04-29 01:41:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-29 01:41:29 +0200 |
| commit | 9f6d693e263b617cd1a1772e42911cd5a0b1675b (patch) | |
| tree | 593d3c9d968be92bc1ed8a445e6856079ef546ed /runtime/syntax/objcpp.vim | |
| parent | 59be0b42806c39131f76f89c554f0a24e82514a8 (diff) | |
| parent | 53419673154a98b705cfa80590099a247cc9df49 (diff) | |
| download | rneovim-9f6d693e263b617cd1a1772e42911cd5a0b1675b.tar.gz rneovim-9f6d693e263b617cd1a1772e42911cd5a0b1675b.tar.bz2 rneovim-9f6d693e263b617cd1a1772e42911cd5a0b1675b.zip | |
Merge #6613 from justinmk/vim-patches
Diffstat (limited to 'runtime/syntax/objcpp.vim')
| -rw-r--r-- | runtime/syntax/objcpp.vim | 18 |
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 |