aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax/antlr.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/antlr.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/antlr.vim')
-rw-r--r--runtime/syntax/antlr.vim30
1 files changed, 8 insertions, 22 deletions
diff --git a/runtime/syntax/antlr.vim b/runtime/syntax/antlr.vim
index 19000293fb..2ac38d7747 100644
--- a/runtime/syntax/antlr.vim
+++ b/runtime/syntax/antlr.vim
@@ -4,11 +4,8 @@
" LastChange: 02 May 2001
" Original: Comes from JavaCC.vim
-" 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
@@ -18,12 +15,8 @@ endif
" Those files usually have the extension *.jj
" source the java.vim file
-if version < 600
- so <sfile>:p:h/java.vim
-else
- runtime! syntax/java.vim
- unlet b:current_syntax
-endif
+runtime! syntax/java.vim
+unlet b:current_syntax
"remove catching errors caused by wrong parenthesis (does not work in antlr
"files) (first define them in case they have not been defined in java)
@@ -53,17 +46,10 @@ syn match antlrSep "[|:]\|\.\."
syn keyword antlrActionToken TOKEN SKIP MORE SPECIAL_TOKEN
syn keyword antlrError DEBUG IGNORE_IN_BNF
-if version >= 508 || !exists("did_antlr_syntax_inits")
- if version < 508
- let did_antlr_syntax_inits = 1
- command -nargs=+ HiLink hi link <args>
- else
- command -nargs=+ HiLink hi def link <args>
- endif
- HiLink antlrSep Statement
- HiLink antlrPackages Statement
- delcommand HiLink
-endif
+command -nargs=+ HiLink hi def link <args>
+HiLink antlrSep Statement
+HiLink antlrPackages Statement
+delcommand HiLink
let b:current_syntax = "antlr"