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/ocaml.vim | 143 ++++++++++++++++++++++------------------------- 1 file changed, 66 insertions(+), 77 deletions(-) (limited to 'runtime/syntax/ocaml.vim') diff --git a/runtime/syntax/ocaml.vim b/runtime/syntax/ocaml.vim index 24116f0e02..1884c31823 100644 --- a/runtime/syntax/ocaml.vim +++ b/runtime/syntax/ocaml.vim @@ -13,11 +13,8 @@ " can be distinguished from begin/end, which is used for indentation, " and folding. (David Baelde) -" 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") && b:current_syntax == "ocaml" +" quit when a syntax file was already loaded +if exists("b:current_syntax") && b:current_syntax == "ocaml" finish endif @@ -253,78 +250,70 @@ syn sync match ocamlSigSync grouphere ocamlSig "\" syn sync match ocamlSigSync groupthere ocamlSig "\" " 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_ocaml_syntax_inits") - if version < 508 - let did_ocaml_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink ocamlBraceErr Error - HiLink ocamlBrackErr Error - HiLink ocamlParenErr Error - HiLink ocamlArrErr Error - - HiLink ocamlCommentErr Error - - HiLink ocamlCountErr Error - HiLink ocamlDoErr Error - HiLink ocamlDoneErr Error - HiLink ocamlEndErr Error - HiLink ocamlThenErr Error - - HiLink ocamlCharErr Error - - HiLink ocamlErr Error - - HiLink ocamlComment Comment - - HiLink ocamlModPath Include - HiLink ocamlObject Include - HiLink ocamlModule Include - HiLink ocamlModParam1 Include - HiLink ocamlModType Include - HiLink ocamlMPRestr3 Include - HiLink ocamlFullMod Include - HiLink ocamlModTypeRestr Include - HiLink ocamlWith Include - HiLink ocamlMTDef Include - - HiLink ocamlScript Include - - HiLink ocamlConstructor Constant - - HiLink ocamlVal Keyword - HiLink ocamlModPreRHS Keyword - HiLink ocamlMPRestr2 Keyword - HiLink ocamlKeyword Keyword - HiLink ocamlMethod Include - HiLink ocamlFunDef Keyword - HiLink ocamlRefAssign Keyword - HiLink ocamlKeyChar Keyword - HiLink ocamlAnyVar Keyword - HiLink ocamlTopStop Keyword - HiLink ocamlOperator Keyword - - HiLink ocamlBoolean Boolean - HiLink ocamlCharacter Character - HiLink ocamlNumber Number - HiLink ocamlFloat Float - HiLink ocamlString String - - HiLink ocamlLabel Identifier - - HiLink ocamlType Type - - HiLink ocamlTodo Todo - - HiLink ocamlEncl Keyword - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink ocamlBraceErr Error +HiLink ocamlBrackErr Error +HiLink ocamlParenErr Error +HiLink ocamlArrErr Error + +HiLink ocamlCommentErr Error + +HiLink ocamlCountErr Error +HiLink ocamlDoErr Error +HiLink ocamlDoneErr Error +HiLink ocamlEndErr Error +HiLink ocamlThenErr Error + +HiLink ocamlCharErr Error + +HiLink ocamlErr Error + +HiLink ocamlComment Comment + +HiLink ocamlModPath Include +HiLink ocamlObject Include +HiLink ocamlModule Include +HiLink ocamlModParam1 Include +HiLink ocamlModType Include +HiLink ocamlMPRestr3 Include +HiLink ocamlFullMod Include +HiLink ocamlModTypeRestr Include +HiLink ocamlWith Include +HiLink ocamlMTDef Include + +HiLink ocamlScript Include + +HiLink ocamlConstructor Constant + +HiLink ocamlVal Keyword +HiLink ocamlModPreRHS Keyword +HiLink ocamlMPRestr2 Keyword +HiLink ocamlKeyword Keyword +HiLink ocamlMethod Include +HiLink ocamlFunDef Keyword +HiLink ocamlRefAssign Keyword +HiLink ocamlKeyChar Keyword +HiLink ocamlAnyVar Keyword +HiLink ocamlTopStop Keyword +HiLink ocamlOperator Keyword + +HiLink ocamlBoolean Boolean +HiLink ocamlCharacter Character +HiLink ocamlNumber Number +HiLink ocamlFloat Float +HiLink ocamlString String + +HiLink ocamlLabel Identifier + +HiLink ocamlType Type + +HiLink ocamlTodo Todo + +HiLink ocamlEncl Keyword + +delcommand HiLink let b:current_syntax = "ocaml" -- 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/ocaml.vim | 92 +++++++++++++++++++++++------------------------- 1 file changed, 45 insertions(+), 47 deletions(-) (limited to 'runtime/syntax/ocaml.vim') diff --git a/runtime/syntax/ocaml.vim b/runtime/syntax/ocaml.vim index 1884c31823..68c1feddae 100644 --- a/runtime/syntax/ocaml.vim +++ b/runtime/syntax/ocaml.vim @@ -251,69 +251,67 @@ syn sync match ocamlSigSync groupthere ocamlSig "\" " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link -HiLink ocamlBraceErr Error -HiLink ocamlBrackErr Error -HiLink ocamlParenErr Error -HiLink ocamlArrErr Error +hi def link ocamlBraceErr Error +hi def link ocamlBrackErr Error +hi def link ocamlParenErr Error +hi def link ocamlArrErr Error -HiLink ocamlCommentErr Error +hi def link ocamlCommentErr Error -HiLink ocamlCountErr Error -HiLink ocamlDoErr Error -HiLink ocamlDoneErr Error -HiLink ocamlEndErr Error -HiLink ocamlThenErr Error +hi def link ocamlCountErr Error +hi def link ocamlDoErr Error +hi def link ocamlDoneErr Error +hi def link ocamlEndErr Error +hi def link ocamlThenErr Error -HiLink ocamlCharErr Error +hi def link ocamlCharErr Error -HiLink ocamlErr Error +hi def link ocamlErr Error -HiLink ocamlComment Comment +hi def link ocamlComment Comment -HiLink ocamlModPath Include -HiLink ocamlObject Include -HiLink ocamlModule Include -HiLink ocamlModParam1 Include -HiLink ocamlModType Include -HiLink ocamlMPRestr3 Include -HiLink ocamlFullMod Include -HiLink ocamlModTypeRestr Include -HiLink ocamlWith Include -HiLink ocamlMTDef Include +hi def link ocamlModPath Include +hi def link ocamlObject Include +hi def link ocamlModule Include +hi def link ocamlModParam1 Include +hi def link ocamlModType Include +hi def link ocamlMPRestr3 Include +hi def link ocamlFullMod Include +hi def link ocamlModTypeRestr Include +hi def link ocamlWith Include +hi def link ocamlMTDef Include -HiLink ocamlScript Include +hi def link ocamlScript Include -HiLink ocamlConstructor Constant +hi def link ocamlConstructor Constant -HiLink ocamlVal Keyword -HiLink ocamlModPreRHS Keyword -HiLink ocamlMPRestr2 Keyword -HiLink ocamlKeyword Keyword -HiLink ocamlMethod Include -HiLink ocamlFunDef Keyword -HiLink ocamlRefAssign Keyword -HiLink ocamlKeyChar Keyword -HiLink ocamlAnyVar Keyword -HiLink ocamlTopStop Keyword -HiLink ocamlOperator Keyword +hi def link ocamlVal Keyword +hi def link ocamlModPreRHS Keyword +hi def link ocamlMPRestr2 Keyword +hi def link ocamlKeyword Keyword +hi def link ocamlMethod Include +hi def link ocamlFunDef Keyword +hi def link ocamlRefAssign Keyword +hi def link ocamlKeyChar Keyword +hi def link ocamlAnyVar Keyword +hi def link ocamlTopStop Keyword +hi def link ocamlOperator Keyword -HiLink ocamlBoolean Boolean -HiLink ocamlCharacter Character -HiLink ocamlNumber Number -HiLink ocamlFloat Float -HiLink ocamlString String +hi def link ocamlBoolean Boolean +hi def link ocamlCharacter Character +hi def link ocamlNumber Number +hi def link ocamlFloat Float +hi def link ocamlString String -HiLink ocamlLabel Identifier +hi def link ocamlLabel Identifier -HiLink ocamlType Type +hi def link ocamlType Type -HiLink ocamlTodo Todo +hi def link ocamlTodo Todo -HiLink ocamlEncl Keyword +hi def link ocamlEncl Keyword -delcommand HiLink let b:current_syntax = "ocaml" -- cgit