aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax/papp.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/papp.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/papp.vim')
-rw-r--r--runtime/syntax/papp.vim29
1 files changed, 6 insertions, 23 deletions
diff --git a/runtime/syntax/papp.vim b/runtime/syntax/papp.vim
index d86dce603f..5b65f05cf4 100644
--- a/runtime/syntax/papp.vim
+++ b/runtime/syntax/papp.vim
@@ -14,41 +14,24 @@
" pod is, btw, allowed everywhere, which is actually wrong :(
-" 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
" source is basically xml, with included html (this is common) and perl bits
-if version < 600
- so <sfile>:p:h/xml.vim
-else
- runtime! syntax/xml.vim
-endif
+runtime! syntax/xml.vim
unlet b:current_syntax
if exists("papp_include_html")
- if version < 600
- syn include @PAppHtml <sfile>:p:h/html.vim
- else
- syn include @PAppHtml syntax/html.vim
- endif
+ syn include @PAppHtml syntax/html.vim
unlet b:current_syntax
syntax spell default " added by Bram
endif
-if version < 600
- syn include @PAppPerl <sfile>:p:h/perl.vim
-else
- syn include @PAppPerl syntax/perl.vim
-endif
+syn include @PAppPerl syntax/perl.vim
-if v:version >= 600
- syn cluster xmlFoldCluster add=papp_perl,papp_xperl,papp_phtml,papp_pxml,papp_perlPOD
-endif
+syn cluster xmlFoldCluster add=papp_perl,papp_xperl,papp_phtml,papp_pxml,papp_perlPOD
" preprocessor commands
syn region papp_prep matchgroup=papp_prep start="^#\s*\(if\|elsif\)" end="$" keepend contains=@perlExpr contained