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/msql.vim | 73 ++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 44 deletions(-) (limited to 'runtime/syntax/msql.vim') diff --git a/runtime/syntax/msql.vim b/runtime/syntax/msql.vim index 0716fbb1f6..6195786260 100644 --- a/runtime/syntax/msql.vim +++ b/runtime/syntax/msql.vim @@ -8,11 +8,8 @@ " Options msql_sql_query = 1 for SQL syntax highligthing inside strings " msql_minlines = x to sync at least x lines backwards -" 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 @@ -20,12 +17,8 @@ if !exists("main_syntax") let main_syntax = 'msql' endif -if version < 600 - so :p:h/html.vim -else - runtime! syntax/html.vim - unlet b:current_syntax -endif +runtime! syntax/html.vim +unlet b:current_syntax syn cluster htmlPreproc add=msqlRegion @@ -57,39 +50,31 @@ else 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_msql_syn_inits") - if version < 508 - let did_msql_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink msqlComment Comment - HiLink msqlString String - HiLink msqlNumber Number - HiLink msqlFloat Float - HiLink msqlIdentifier Identifier - HiLink msqlGlobalIdentifier Identifier - HiLink msqlIntVar Identifier - HiLink msqlEnvVar Identifier - HiLink msqlFunctions Function - HiLink msqlRepeat Repeat - HiLink msqlConditional Conditional - HiLink msqlStatement Statement - HiLink msqlType Type - HiLink msqlInclude Include - HiLink msqlDefine Define - HiLink msqlSpecialChar SpecialChar - HiLink msqlParentError Error - HiLink msqlTodo Todo - HiLink msqlOperator Operator - HiLink msqlRelation Operator - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink msqlComment Comment +HiLink msqlString String +HiLink msqlNumber Number +HiLink msqlFloat Float +HiLink msqlIdentifier Identifier +HiLink msqlGlobalIdentifier Identifier +HiLink msqlIntVar Identifier +HiLink msqlEnvVar Identifier +HiLink msqlFunctions Function +HiLink msqlRepeat Repeat +HiLink msqlConditional Conditional +HiLink msqlStatement Statement +HiLink msqlType Type +HiLink msqlInclude Include +HiLink msqlDefine Define +HiLink msqlSpecialChar SpecialChar +HiLink msqlParentError Error +HiLink msqlTodo Todo +HiLink msqlOperator Operator +HiLink msqlRelation Operator + +delcommand HiLink let b:current_syntax = "msql" -- 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/msql.vim | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'runtime/syntax/msql.vim') diff --git a/runtime/syntax/msql.vim b/runtime/syntax/msql.vim index 6195786260..60e75a7ef6 100644 --- a/runtime/syntax/msql.vim +++ b/runtime/syntax/msql.vim @@ -51,30 +51,28 @@ endif " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link - -HiLink msqlComment Comment -HiLink msqlString String -HiLink msqlNumber Number -HiLink msqlFloat Float -HiLink msqlIdentifier Identifier -HiLink msqlGlobalIdentifier Identifier -HiLink msqlIntVar Identifier -HiLink msqlEnvVar Identifier -HiLink msqlFunctions Function -HiLink msqlRepeat Repeat -HiLink msqlConditional Conditional -HiLink msqlStatement Statement -HiLink msqlType Type -HiLink msqlInclude Include -HiLink msqlDefine Define -HiLink msqlSpecialChar SpecialChar -HiLink msqlParentError Error -HiLink msqlTodo Todo -HiLink msqlOperator Operator -HiLink msqlRelation Operator - -delcommand HiLink + +hi def link msqlComment Comment +hi def link msqlString String +hi def link msqlNumber Number +hi def link msqlFloat Float +hi def link msqlIdentifier Identifier +hi def link msqlGlobalIdentifier Identifier +hi def link msqlIntVar Identifier +hi def link msqlEnvVar Identifier +hi def link msqlFunctions Function +hi def link msqlRepeat Repeat +hi def link msqlConditional Conditional +hi def link msqlStatement Statement +hi def link msqlType Type +hi def link msqlInclude Include +hi def link msqlDefine Define +hi def link msqlSpecialChar SpecialChar +hi def link msqlParentError Error +hi def link msqlTodo Todo +hi def link msqlOperator Operator +hi def link msqlRelation Operator + let b:current_syntax = "msql" -- cgit