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/kix.vim | 90 ++++++++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 50 deletions(-) (limited to 'runtime/syntax/kix.vim') diff --git a/runtime/syntax/kix.vim b/runtime/syntax/kix.vim index 800e286042..cbc837c4d1 100644 --- a/runtime/syntax/kix.vim +++ b/runtime/syntax/kix.vim @@ -19,10 +19,8 @@ " Work out how to error too many "(", i.e. (() should be an error. " Similarly, "if" without "endif" and similar constructs should error. -" Clear legacy syntax rules for version 5.x, exit if already processed for version 6+ -if version < 600 - syn clear -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -130,52 +128,44 @@ syn match kixExpression "<\|>\|<=\|>=\|<>" " Default highlighting. -" Version < 5.8 set default highlight if file not already processed. -" Version >= 5.8 set default highlight only if it doesn't already have a value. -if version > 508 || !exists("did_kix_syn_inits") - if version < 508 - let did_kix_syn_inits=1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink kixDoubleString String - HiLink kixSingleString String - HiLink kixStatement Statement - HiLink kixRepeat Repeat - HiLink kixComment Comment - HiLink kixBuiltin Function - HiLink kixLocalVar Special - HiLink kixMacro Special - HiLink kixEnvVar Special - HiLink kixLabel Type - HiLink kixFunction Function - HiLink kixInteger Number - HiLink kixHex Number - HiLink kixFloat Number - HiLink kixOperator Operator - HiLink kixExpression Operator - - HiLink kixParenCloseError Error - HiLink kixBrackCloseError Error - HiLink kixStringError Error - - HiLink kixWhileError Error - HiLink kixWhileOK Conditional - HiLink kixDoError Error - HiLink kixDoOK Conditional - HiLink kixIfError Error - HiLink kixIfOK Conditional - HiLink kixSelectError Error - HiLink kixSelectOK Conditional - HiLink kixForNextError Error - HiLink kixForNextOK Conditional - HiLink kixForEachError Error - HiLink kixForEachOK Conditional - - delcommand HiLink -endif +" Set default highlight only if it doesn't already have a value. +command -nargs=+ HiLink hi def link + +HiLink kixDoubleString String +HiLink kixSingleString String +HiLink kixStatement Statement +HiLink kixRepeat Repeat +HiLink kixComment Comment +HiLink kixBuiltin Function +HiLink kixLocalVar Special +HiLink kixMacro Special +HiLink kixEnvVar Special +HiLink kixLabel Type +HiLink kixFunction Function +HiLink kixInteger Number +HiLink kixHex Number +HiLink kixFloat Number +HiLink kixOperator Operator +HiLink kixExpression Operator + +HiLink kixParenCloseError Error +HiLink kixBrackCloseError Error +HiLink kixStringError Error + +HiLink kixWhileError Error +HiLink kixWhileOK Conditional +HiLink kixDoError Error +HiLink kixDoOK Conditional +HiLink kixIfError Error +HiLink kixIfOK Conditional +HiLink kixSelectError Error +HiLink kixSelectOK Conditional +HiLink kixForNextError Error +HiLink kixForNextOK Conditional +HiLink kixForEachError Error +HiLink kixForEachOK Conditional + +delcommand HiLink let b:current_syntax = "kix" -- cgit From 86b596dc7a49f1b148ef82a356b972b93ed0f6d4 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 28 Apr 2017 21:14:34 +0200 Subject: vim-patch:f37506f60f87 Updated runtime files. Remove HiLink commands. https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c --- runtime/syntax/kix.vim | 72 ++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 37 deletions(-) (limited to 'runtime/syntax/kix.vim') diff --git a/runtime/syntax/kix.vim b/runtime/syntax/kix.vim index cbc837c4d1..8efe02baee 100644 --- a/runtime/syntax/kix.vim +++ b/runtime/syntax/kix.vim @@ -129,43 +129,41 @@ syn match kixExpression "<\|>\|<=\|>=\|<>" " Default highlighting. " Set default highlight only if it doesn't already have a value. -command -nargs=+ HiLink hi def link - -HiLink kixDoubleString String -HiLink kixSingleString String -HiLink kixStatement Statement -HiLink kixRepeat Repeat -HiLink kixComment Comment -HiLink kixBuiltin Function -HiLink kixLocalVar Special -HiLink kixMacro Special -HiLink kixEnvVar Special -HiLink kixLabel Type -HiLink kixFunction Function -HiLink kixInteger Number -HiLink kixHex Number -HiLink kixFloat Number -HiLink kixOperator Operator -HiLink kixExpression Operator - -HiLink kixParenCloseError Error -HiLink kixBrackCloseError Error -HiLink kixStringError Error - -HiLink kixWhileError Error -HiLink kixWhileOK Conditional -HiLink kixDoError Error -HiLink kixDoOK Conditional -HiLink kixIfError Error -HiLink kixIfOK Conditional -HiLink kixSelectError Error -HiLink kixSelectOK Conditional -HiLink kixForNextError Error -HiLink kixForNextOK Conditional -HiLink kixForEachError Error -HiLink kixForEachOK Conditional - -delcommand HiLink + +hi def link kixDoubleString String +hi def link kixSingleString String +hi def link kixStatement Statement +hi def link kixRepeat Repeat +hi def link kixComment Comment +hi def link kixBuiltin Function +hi def link kixLocalVar Special +hi def link kixMacro Special +hi def link kixEnvVar Special +hi def link kixLabel Type +hi def link kixFunction Function +hi def link kixInteger Number +hi def link kixHex Number +hi def link kixFloat Number +hi def link kixOperator Operator +hi def link kixExpression Operator + +hi def link kixParenCloseError Error +hi def link kixBrackCloseError Error +hi def link kixStringError Error + +hi def link kixWhileError Error +hi def link kixWhileOK Conditional +hi def link kixDoError Error +hi def link kixDoOK Conditional +hi def link kixIfError Error +hi def link kixIfOK Conditional +hi def link kixSelectError Error +hi def link kixSelectOK Conditional +hi def link kixForNextError Error +hi def link kixForNextOK Conditional +hi def link kixForEachError Error +hi def link kixForEachOK Conditional + let b:current_syntax = "kix" -- cgit