From a53409b564458f7a94c8fcd0725d1953dee58dce Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 28 Apr 2017 21:06:44 +0200 Subject: vim-patch:89bcfda6834a Updated runtime files. Remove version checks for Vim older than 6.0. https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 --- runtime/syntax/lua.vim | 63 +++++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 37 deletions(-) (limited to 'runtime/syntax/lua.vim') 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 - else - command -nargs=+ HiLink hi def link - endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link - 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" -- cgit