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/clean.vim | 81 +++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 46 deletions(-) (limited to 'runtime/syntax/clean.vim') diff --git a/runtime/syntax/clean.vim b/runtime/syntax/clean.vim index ea95aa209e..13ddfaba3c 100644 --- a/runtime/syntax/clean.vim +++ b/runtime/syntax/clean.vim @@ -4,11 +4,8 @@ " Co-Author: Arthur van Leeuwen " Last Change: 2013 Oct 15 by Jurriën Stutterheim -" 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 @@ -52,49 +49,41 @@ syn match cleanFuncTypeDef "\([a-zA-Z].*\|(\=[-~@#$%^?!+*<>\/|&=:]\+)\=\)\s*\(in " 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_clean_syntax_init") - if version < 508 - let did_clean_syntax_init = 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 - " Comments - HiLink cleanComment Comment - " Constants and denotations - HiLink cleanStringDenot String - HiLink cleanCharDenot Character - HiLink cleanIntegerDenot Number - HiLink cleanBoolDenot Boolean - HiLink cleanRealDenot Float - " Identifiers - " Statements - HiLink cleanTypeClass Keyword - HiLink cleanConditional Conditional - HiLink cleanLabel Label - HiLink cleanKeyword Keyword - " Generic Preprocessing - HiLink cleanIncludeKeyword Include - HiLink cleanModuleSystem PreProc - " Type - HiLink cleanBasicType Type - HiLink cleanSpecialType Type - HiLink cleanFuncTypeDef Typedef - " Special - HiLink cleanSpecial Special - HiLink cleanList Special - HiLink cleanArray Special - HiLink cleanRecord Special - HiLink cleanTuple Special - " Error - " Todo - HiLink cleanTodo Todo + " Comments + HiLink cleanComment Comment + " Constants and denotations + HiLink cleanStringDenot String + HiLink cleanCharDenot Character + HiLink cleanIntegerDenot Number + HiLink cleanBoolDenot Boolean + HiLink cleanRealDenot Float + " Identifiers + " Statements + HiLink cleanTypeClass Keyword + HiLink cleanConditional Conditional + HiLink cleanLabel Label + HiLink cleanKeyword Keyword + " Generic Preprocessing + HiLink cleanIncludeKeyword Include + HiLink cleanModuleSystem PreProc + " Type + HiLink cleanBasicType Type + HiLink cleanSpecialType Type + HiLink cleanFuncTypeDef Typedef + " Special + HiLink cleanSpecial Special + HiLink cleanList Special + HiLink cleanArray Special + HiLink cleanRecord Special + HiLink cleanTuple Special + " Error + " Todo + HiLink cleanTodo Todo - delcommand HiLink -endif +delcommand HiLink let b:current_syntax = "clean" -- 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/clean.vim | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'runtime/syntax/clean.vim') diff --git a/runtime/syntax/clean.vim b/runtime/syntax/clean.vim index 13ddfaba3c..70bf654fb7 100644 --- a/runtime/syntax/clean.vim +++ b/runtime/syntax/clean.vim @@ -50,40 +50,38 @@ syn match cleanFuncTypeDef "\([a-zA-Z].*\|(\=[-~@#$%^?!+*<>\/|&=:]\+)\=\)\s*\(in " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link " Comments - HiLink cleanComment Comment + hi def link cleanComment Comment " Constants and denotations - HiLink cleanStringDenot String - HiLink cleanCharDenot Character - HiLink cleanIntegerDenot Number - HiLink cleanBoolDenot Boolean - HiLink cleanRealDenot Float + hi def link cleanStringDenot String + hi def link cleanCharDenot Character + hi def link cleanIntegerDenot Number + hi def link cleanBoolDenot Boolean + hi def link cleanRealDenot Float " Identifiers " Statements - HiLink cleanTypeClass Keyword - HiLink cleanConditional Conditional - HiLink cleanLabel Label - HiLink cleanKeyword Keyword + hi def link cleanTypeClass Keyword + hi def link cleanConditional Conditional + hi def link cleanLabel Label + hi def link cleanKeyword Keyword " Generic Preprocessing - HiLink cleanIncludeKeyword Include - HiLink cleanModuleSystem PreProc + hi def link cleanIncludeKeyword Include + hi def link cleanModuleSystem PreProc " Type - HiLink cleanBasicType Type - HiLink cleanSpecialType Type - HiLink cleanFuncTypeDef Typedef + hi def link cleanBasicType Type + hi def link cleanSpecialType Type + hi def link cleanFuncTypeDef Typedef " Special - HiLink cleanSpecial Special - HiLink cleanList Special - HiLink cleanArray Special - HiLink cleanRecord Special - HiLink cleanTuple Special + hi def link cleanSpecial Special + hi def link cleanList Special + hi def link cleanArray Special + hi def link cleanRecord Special + hi def link cleanTuple Special " Error " Todo - HiLink cleanTodo Todo + hi def link cleanTodo Todo -delcommand HiLink let b:current_syntax = "clean" -- cgit