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/occam.vim | 68 +++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 38 deletions(-) (limited to 'runtime/syntax/occam.vim') diff --git a/runtime/syntax/occam.vim b/runtime/syntax/occam.vim index 1c84bf00f6..bab84f2e18 100644 --- a/runtime/syntax/occam.vim +++ b/runtime/syntax/occam.vim @@ -4,9 +4,8 @@ " Maintainer: Mario Schweigler " Last Change: 24 May 2003 -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 @@ -86,41 +85,34 @@ syn match occamCDString /<\|>\|=\|(\|)/ contained syn region occamCDirective start=/#\(USE\|INCLUDE\|PRAGMA\|DEFINE\|UNDEFINE\|UNDEF\|IF\|ELIF\|ELSE\|ENDIF\|WARNING\|ERROR\|RELAX\)\>/ end=/$/ contains=occamString,occamComment,occamCDString -if version >= 508 || !exists("did_occam_syn_inits") - if version < 508 - let did_occam_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink occamType Type - HiLink occamKeyword Keyword - HiLink occamComment Comment - HiLink occamCommentTitle PreProc - HiLink occamTodo Todo - HiLink occamNote Todo - HiLink occamString String - HiLink occamCharString String - HiLink occamNumber Number - HiLink occamCDirective PreProc - HiLink occamCDString String - HiLink occamPPIdentifier PreProc - HiLink occamBoolean Boolean - HiLink occamSpecialChar SpecialChar - HiLink occamChar Character - HiLink occamStructure Structure - HiLink occamIdentifier Identifier - HiLink occamConstant Constant - HiLink occamOperator Operator - HiLink occamFunction Ignore - HiLink occamRepeat Repeat - HiLink occamConditional Conditional - HiLink occamBrackets Type - HiLink occamParantheses Delimiter - - delcommand HiLink -endif +command -nargs=+ HiLink hi def link + +HiLink occamType Type +HiLink occamKeyword Keyword +HiLink occamComment Comment +HiLink occamCommentTitle PreProc +HiLink occamTodo Todo +HiLink occamNote Todo +HiLink occamString String +HiLink occamCharString String +HiLink occamNumber Number +HiLink occamCDirective PreProc +HiLink occamCDString String +HiLink occamPPIdentifier PreProc +HiLink occamBoolean Boolean +HiLink occamSpecialChar SpecialChar +HiLink occamChar Character +HiLink occamStructure Structure +HiLink occamIdentifier Identifier +HiLink occamConstant Constant +HiLink occamOperator Operator +HiLink occamFunction Ignore +HiLink occamRepeat Repeat +HiLink occamConditional Conditional +HiLink occamBrackets Type +HiLink occamParantheses Delimiter + +delcommand HiLink let b:current_syntax = "occam" -- 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/occam.vim | 54 +++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'runtime/syntax/occam.vim') diff --git a/runtime/syntax/occam.vim b/runtime/syntax/occam.vim index bab84f2e18..01d139bd09 100644 --- a/runtime/syntax/occam.vim +++ b/runtime/syntax/occam.vim @@ -85,34 +85,32 @@ syn match occamCDString /<\|>\|=\|(\|)/ contained syn region occamCDirective start=/#\(USE\|INCLUDE\|PRAGMA\|DEFINE\|UNDEFINE\|UNDEF\|IF\|ELIF\|ELSE\|ENDIF\|WARNING\|ERROR\|RELAX\)\>/ end=/$/ contains=occamString,occamComment,occamCDString -command -nargs=+ HiLink hi def link - -HiLink occamType Type -HiLink occamKeyword Keyword -HiLink occamComment Comment -HiLink occamCommentTitle PreProc -HiLink occamTodo Todo -HiLink occamNote Todo -HiLink occamString String -HiLink occamCharString String -HiLink occamNumber Number -HiLink occamCDirective PreProc -HiLink occamCDString String -HiLink occamPPIdentifier PreProc -HiLink occamBoolean Boolean -HiLink occamSpecialChar SpecialChar -HiLink occamChar Character -HiLink occamStructure Structure -HiLink occamIdentifier Identifier -HiLink occamConstant Constant -HiLink occamOperator Operator -HiLink occamFunction Ignore -HiLink occamRepeat Repeat -HiLink occamConditional Conditional -HiLink occamBrackets Type -HiLink occamParantheses Delimiter - -delcommand HiLink + +hi def link occamType Type +hi def link occamKeyword Keyword +hi def link occamComment Comment +hi def link occamCommentTitle PreProc +hi def link occamTodo Todo +hi def link occamNote Todo +hi def link occamString String +hi def link occamCharString String +hi def link occamNumber Number +hi def link occamCDirective PreProc +hi def link occamCDString String +hi def link occamPPIdentifier PreProc +hi def link occamBoolean Boolean +hi def link occamSpecialChar SpecialChar +hi def link occamChar Character +hi def link occamStructure Structure +hi def link occamIdentifier Identifier +hi def link occamConstant Constant +hi def link occamOperator Operator +hi def link occamFunction Ignore +hi def link occamRepeat Repeat +hi def link occamConditional Conditional +hi def link occamBrackets Type +hi def link occamParantheses Delimiter + let b:current_syntax = "occam" -- cgit