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/sicad.vim | 77 ++++++++++++++++++------------------------------ 1 file changed, 28 insertions(+), 49 deletions(-) (limited to 'runtime/syntax/sicad.vim') diff --git a/runtime/syntax/sicad.vim b/runtime/syntax/sicad.vim index 7e32451bed..04f870d04e 100644 --- a/runtime/syntax/sicad.vim +++ b/runtime/syntax/sicad.vim @@ -4,28 +4,17 @@ " Last Change: 2003 May 11 " URL: http://lmark.mgx.hu:81/download/vim/sicad.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 " use SQL highlighting after 'sql' command -if version >= 600 - syn include @SQL syntax/sql.vim -else - syn include @SQL :p:h/sql.vim -endif +syn include @SQL syntax/sql.vim unlet b:current_syntax " spaces are used in (auto)indents since sicad hates tabulator characters -if version >= 600 - setlocal expandtab -else - set expandtab -endif +setlocal expandtab " ignore case syn case ignore @@ -369,44 +358,34 @@ syn keyword sicadStatement zparbn zparf zparfn zparfw zparfwn syn keyword sicadStatement zparp zparpn zwinkp zwinkpn " 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_sicad_syntax_inits") - - if version < 508 - let did_sicad_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 sicadLabel PreProc - HiLink sicadLabel1 sicadLabel - HiLink sicadLabel2 sicadLabel - HiLink sicadConditional Conditional - HiLink sicadBoolean Boolean - HiLink sicadNumber Number - HiLink sicadFloat Float - HiLink sicadOperator Operator - HiLink sicadStatement Statement - HiLink sicadParameter sicadStatement - HiLink sicadGoto sicadStatement - HiLink sicadLineCont sicadStatement - HiLink sicadString String - HiLink sicadComment Comment - HiLink sicadSpecial Special - HiLink sicadIdentifier Type +HiLink sicadLabel PreProc +HiLink sicadLabel1 sicadLabel +HiLink sicadLabel2 sicadLabel +HiLink sicadConditional Conditional +HiLink sicadBoolean Boolean +HiLink sicadNumber Number +HiLink sicadFloat Float +HiLink sicadOperator Operator +HiLink sicadStatement Statement +HiLink sicadParameter sicadStatement +HiLink sicadGoto sicadStatement +HiLink sicadLineCont sicadStatement +HiLink sicadString String +HiLink sicadComment Comment +HiLink sicadSpecial Special +HiLink sicadIdentifier Type " HiLink sicadIdentifier Identifier - HiLink sicadError Error - HiLink sicadParenError sicadError - HiLink sicadApostropheError sicadError - HiLink sicadStringError sicadError - HiLink sicadCommentError sicadError +HiLink sicadError Error +HiLink sicadParenError sicadError +HiLink sicadApostropheError sicadError +HiLink sicadStringError sicadError +HiLink sicadCommentError sicadError " HiLink sqlStatement Special " modified highlight group in sql.vim - delcommand HiLink - -endif +delcommand HiLink let b:current_syntax = "sicad" -- 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/sicad.vim | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) (limited to 'runtime/syntax/sicad.vim') diff --git a/runtime/syntax/sicad.vim b/runtime/syntax/sicad.vim index 04f870d04e..20eb14cba1 100644 --- a/runtime/syntax/sicad.vim +++ b/runtime/syntax/sicad.vim @@ -359,33 +359,31 @@ syn keyword sicadStatement zparp zparpn zwinkp zwinkpn " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link -HiLink sicadLabel PreProc -HiLink sicadLabel1 sicadLabel -HiLink sicadLabel2 sicadLabel -HiLink sicadConditional Conditional -HiLink sicadBoolean Boolean -HiLink sicadNumber Number -HiLink sicadFloat Float -HiLink sicadOperator Operator -HiLink sicadStatement Statement -HiLink sicadParameter sicadStatement -HiLink sicadGoto sicadStatement -HiLink sicadLineCont sicadStatement -HiLink sicadString String -HiLink sicadComment Comment -HiLink sicadSpecial Special -HiLink sicadIdentifier Type -" HiLink sicadIdentifier Identifier -HiLink sicadError Error -HiLink sicadParenError sicadError -HiLink sicadApostropheError sicadError -HiLink sicadStringError sicadError -HiLink sicadCommentError sicadError -" HiLink sqlStatement Special " modified highlight group in sql.vim +hi def link sicadLabel PreProc +hi def link sicadLabel1 sicadLabel +hi def link sicadLabel2 sicadLabel +hi def link sicadConditional Conditional +hi def link sicadBoolean Boolean +hi def link sicadNumber Number +hi def link sicadFloat Float +hi def link sicadOperator Operator +hi def link sicadStatement Statement +hi def link sicadParameter sicadStatement +hi def link sicadGoto sicadStatement +hi def link sicadLineCont sicadStatement +hi def link sicadString String +hi def link sicadComment Comment +hi def link sicadSpecial Special +hi def link sicadIdentifier Type +" hi def link sicadIdentifier Identifier +hi def link sicadError Error +hi def link sicadParenError sicadError +hi def link sicadApostropheError sicadError +hi def link sicadStringError sicadError +hi def link sicadCommentError sicadError +" hi def link sqlStatement Special " modified highlight group in sql.vim -delcommand HiLink let b:current_syntax = "sicad" -- cgit