aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax/lua.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/lua.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/lua.vim')
-rw-r--r--runtime/syntax/lua.vim63
1 files changed, 26 insertions, 37 deletions
diff --git a/runtime/syntax/lua.vim b/runtime/syntax/lua.vim
index 3ff80b1ebe..5ef771bb75 100644
--- a/runtime/syntax/lua.vim
+++ b/runtime/syntax/lua.vim
@@ -7,11 +7,8 @@
" lua_subversion = 0 (4.0, 5.0) or 1 (5.1) or 2 (5.2)
" default 5.2
-" 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
@@ -325,40 +322,32 @@ elseif lua_version == 5
endif
" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lua_syntax_inits")
- if version < 508
- let did_lua_syntax_inits = 1
- command -nargs=+ HiLink hi link <args>
- else
- command -nargs=+ HiLink hi def link <args>
- endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
- HiLink luaStatement Statement
- HiLink luaRepeat Repeat
- HiLink luaFor Repeat
- HiLink luaString String
- HiLink luaString2 String
- HiLink luaNumber Number
- HiLink luaOperator Operator
- HiLink luaIn Operator
- HiLink luaConstant Constant
- HiLink luaCond Conditional
- HiLink luaElse Conditional
- HiLink luaFunction Function
- HiLink luaComment Comment
- HiLink luaTodo Todo
- HiLink luaTable Structure
- HiLink luaError Error
- HiLink luaParenError Error
- HiLink luaBraceError Error
- HiLink luaSpecial SpecialChar
- HiLink luaFunc Identifier
- HiLink luaLabel Label
+HiLink luaStatement Statement
+HiLink luaRepeat Repeat
+HiLink luaFor Repeat
+HiLink luaString String
+HiLink luaString2 String
+HiLink luaNumber Number
+HiLink luaOperator Operator
+HiLink luaIn Operator
+HiLink luaConstant Constant
+HiLink luaCond Conditional
+HiLink luaElse Conditional
+HiLink luaFunction Function
+HiLink luaComment Comment
+HiLink luaTodo Todo
+HiLink luaTable Structure
+HiLink luaError Error
+HiLink luaParenError Error
+HiLink luaBraceError Error
+HiLink luaSpecial SpecialChar
+HiLink luaFunc Identifier
+HiLink luaLabel Label
- delcommand HiLink
-endif
+delcommand HiLink
let b:current_syntax = "lua"