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/scheme.vim | 55 +++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 35 deletions(-) (limited to 'runtime/syntax/scheme.vim') diff --git a/runtime/syntax/scheme.vim b/runtime/syntax/scheme.vim index c59e09cd17..ac50ead6ce 100644 --- a/runtime/syntax/scheme.vim +++ b/runtime/syntax/scheme.vim @@ -14,11 +14,8 @@ " Initializing: -" 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 @@ -64,11 +61,7 @@ syn region schemeUnquote matchgroup=Delimiter start=",@#\[" end="\]" contains=AL " R5RS Scheme Functions and Syntax: -if version < 600 - set iskeyword=33,35-39,42-58,60-90,94,95,97-122,126,_ -else - setlocal iskeyword=33,35-39,42-58,60-90,94,95,97-122,126,_ -endif +setlocal iskeyword=33,35-39,42-58,60-90,94,95,97-122,126,_ syn keyword schemeSyntax lambda and or if cond case define let let* letrec syn keyword schemeSyntax begin do delay set! else => @@ -306,38 +299,30 @@ syn sync match matchPlace grouphere NONE "^[^ \t]" " ... i.e. synchronize on a line that starts at the left margin " 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_scheme_syntax_inits") - if version < 508 - let did_scheme_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 schemeSyntax Statement - HiLink schemeFunc Function +HiLink schemeSyntax Statement +HiLink schemeFunc Function - HiLink schemeString String - HiLink schemeCharacter Character - HiLink schemeNumber Number - HiLink schemeBoolean Boolean +HiLink schemeString String +HiLink schemeCharacter Character +HiLink schemeNumber Number +HiLink schemeBoolean Boolean - HiLink schemeDelimiter Delimiter - HiLink schemeConstant Constant +HiLink schemeDelimiter Delimiter +HiLink schemeConstant Constant - HiLink schemeComment Comment - HiLink schemeMultilineComment Comment - HiLink schemeError Error +HiLink schemeComment Comment +HiLink schemeMultilineComment Comment +HiLink schemeError Error - HiLink schemeExtSyntax Type - HiLink schemeExtFunc PreProc +HiLink schemeExtSyntax Type +HiLink schemeExtFunc PreProc - HiLink schemeLang PreProc +HiLink schemeLang PreProc - delcommand HiLink -endif +delcommand HiLink let b:current_syntax = "scheme" -- 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/scheme.vim | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'runtime/syntax/scheme.vim') diff --git a/runtime/syntax/scheme.vim b/runtime/syntax/scheme.vim index ac50ead6ce..af9a659e07 100644 --- a/runtime/syntax/scheme.vim +++ b/runtime/syntax/scheme.vim @@ -300,29 +300,27 @@ syn sync match matchPlace grouphere NONE "^[^ \t]" " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link -HiLink schemeSyntax Statement -HiLink schemeFunc Function +hi def link schemeSyntax Statement +hi def link schemeFunc Function -HiLink schemeString String -HiLink schemeCharacter Character -HiLink schemeNumber Number -HiLink schemeBoolean Boolean +hi def link schemeString String +hi def link schemeCharacter Character +hi def link schemeNumber Number +hi def link schemeBoolean Boolean -HiLink schemeDelimiter Delimiter -HiLink schemeConstant Constant +hi def link schemeDelimiter Delimiter +hi def link schemeConstant Constant -HiLink schemeComment Comment -HiLink schemeMultilineComment Comment -HiLink schemeError Error +hi def link schemeComment Comment +hi def link schemeMultilineComment Comment +hi def link schemeError Error -HiLink schemeExtSyntax Type -HiLink schemeExtFunc PreProc +hi def link schemeExtSyntax Type +hi def link schemeExtFunc PreProc -HiLink schemeLang PreProc +hi def link schemeLang PreProc -delcommand HiLink let b:current_syntax = "scheme" -- cgit