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/erlang.vim | 219 ++++++++++++++++++++++------------------------ 1 file changed, 103 insertions(+), 116 deletions(-) (limited to 'runtime/syntax/erlang.vim') diff --git a/runtime/syntax/erlang.vim b/runtime/syntax/erlang.vim index 02597e75f3..a49f24ed14 100644 --- a/runtime/syntax/erlang.vim +++ b/runtime/syntax/erlang.vim @@ -28,11 +28,8 @@ " " syn keyword erlangAttribute myattr1 myattr2 contained -" 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 @@ -42,9 +39,7 @@ set cpo&vim " Case sensitive syn case match -if version >= 600 - setlocal iskeyword+=$,@-@ -endif +setlocal iskeyword+=$,@-@ " Comments syn match erlangComment '%.*$' contains=erlangCommentAnnotation,erlangTodo @@ -147,116 +142,108 @@ let b:erlang_syntax_synced = 1 let s:old_style = (exists("g:erlang_old_style_highlight") && \g:erlang_old_style_highlight == 1) -" 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_erlang_inits") - if version < 508 - let did_erlang_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - " Comments - HiLink erlangComment Comment - HiLink erlangCommentAnnotation Special - HiLink erlangTodo Todo - HiLink erlangShebang Comment - - " Numbers - HiLink erlangNumberInteger Number - HiLink erlangNumberFloat Float - - " Strings, atoms, characters - HiLink erlangString String - - if s:old_style - HiLink erlangQuotedAtom Type - else - HiLink erlangQuotedAtom String - endif - - HiLink erlangStringModifier Special - HiLink erlangQuotedAtomModifier Special - HiLink erlangModifier Special - - " Operators, separators - HiLink erlangOperator Operator - HiLink erlangRightArrow Operator - if s:old_style - HiLink erlangBracket Normal - HiLink erlangPipe Normal - else - HiLink erlangBracket Delimiter - HiLink erlangPipe Delimiter - endif - - " Atoms, functions, variables, macros - if s:old_style - HiLink erlangAtom Normal - HiLink erlangLocalFuncCall Normal - HiLink erlangLocalFuncRef Normal - HiLink erlangGlobalFuncCall Function - HiLink erlangGlobalFuncRef Function - HiLink erlangVariable Normal - HiLink erlangMacro Normal - HiLink erlangRecord Normal - else - HiLink erlangAtom String - HiLink erlangLocalFuncCall Normal - HiLink erlangLocalFuncRef Normal - HiLink erlangGlobalFuncCall Normal - HiLink erlangGlobalFuncRef Normal - HiLink erlangVariable Identifier - HiLink erlangMacro Macro - HiLink erlangRecord Structure - endif - - " Bitstrings - if !s:old_style - HiLink erlangBitType Type - endif - - " Constants and Directives - if s:old_style - HiLink erlangAttribute Type - HiLink erlangMacroDef Type - HiLink erlangUnknownAttribute Normal - HiLink erlangInclude Type - HiLink erlangRecordDef Type - HiLink erlangDefine Type - HiLink erlangPreCondit Type - HiLink erlangType Type - else - HiLink erlangAttribute Keyword - HiLink erlangMacroDef Macro - HiLink erlangUnknownAttribute Normal - HiLink erlangInclude Include - HiLink erlangRecordDef Keyword - HiLink erlangDefine Define - HiLink erlangPreCondit PreCondit - HiLink erlangType Type - endif - - " Keywords - HiLink erlangKeyword Keyword - - " Build-in-functions (BIFs) - HiLink erlangBIF Function - - if s:old_style - HiLink erlangBoolean Statement - HiLink erlangExtra Statement - HiLink erlangSignal Statement - else - HiLink erlangBoolean Boolean - HiLink erlangExtra Statement - HiLink erlangSignal Statement - endif - - delcommand HiLink +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +" Comments +HiLink erlangComment Comment +HiLink erlangCommentAnnotation Special +HiLink erlangTodo Todo +HiLink erlangShebang Comment + +" Numbers +HiLink erlangNumberInteger Number +HiLink erlangNumberFloat Float + +" Strings, atoms, characters +HiLink erlangString String + +if s:old_style +HiLink erlangQuotedAtom Type +else +HiLink erlangQuotedAtom String +endif + +HiLink erlangStringModifier Special +HiLink erlangQuotedAtomModifier Special +HiLink erlangModifier Special + +" Operators, separators +HiLink erlangOperator Operator +HiLink erlangRightArrow Operator +if s:old_style +HiLink erlangBracket Normal +HiLink erlangPipe Normal +else +HiLink erlangBracket Delimiter +HiLink erlangPipe Delimiter +endif + +" Atoms, functions, variables, macros +if s:old_style +HiLink erlangAtom Normal +HiLink erlangLocalFuncCall Normal +HiLink erlangLocalFuncRef Normal +HiLink erlangGlobalFuncCall Function +HiLink erlangGlobalFuncRef Function +HiLink erlangVariable Normal +HiLink erlangMacro Normal +HiLink erlangRecord Normal +else +HiLink erlangAtom String +HiLink erlangLocalFuncCall Normal +HiLink erlangLocalFuncRef Normal +HiLink erlangGlobalFuncCall Normal +HiLink erlangGlobalFuncRef Normal +HiLink erlangVariable Identifier +HiLink erlangMacro Macro +HiLink erlangRecord Structure endif +" Bitstrings +if !s:old_style +HiLink erlangBitType Type +endif + +" Constants and Directives +if s:old_style +HiLink erlangAttribute Type +HiLink erlangMacroDef Type +HiLink erlangUnknownAttribute Normal +HiLink erlangInclude Type +HiLink erlangRecordDef Type +HiLink erlangDefine Type +HiLink erlangPreCondit Type +HiLink erlangType Type +else +HiLink erlangAttribute Keyword +HiLink erlangMacroDef Macro +HiLink erlangUnknownAttribute Normal +HiLink erlangInclude Include +HiLink erlangRecordDef Keyword +HiLink erlangDefine Define +HiLink erlangPreCondit PreCondit +HiLink erlangType Type +endif + +" Keywords +HiLink erlangKeyword Keyword + +" Build-in-functions (BIFs) +HiLink erlangBIF Function + +if s:old_style +HiLink erlangBoolean Statement +HiLink erlangExtra Statement +HiLink erlangSignal Statement +else +HiLink erlangBoolean Boolean +HiLink erlangExtra Statement +HiLink erlangSignal Statement +endif + +delcommand HiLink + let b:current_syntax = "erlang" let &cpo = s:cpo_save -- 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/erlang.vim | 120 +++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 61 deletions(-) (limited to 'runtime/syntax/erlang.vim') diff --git a/runtime/syntax/erlang.vim b/runtime/syntax/erlang.vim index a49f24ed14..11b763409b 100644 --- a/runtime/syntax/erlang.vim +++ b/runtime/syntax/erlang.vim @@ -143,106 +143,104 @@ let s:old_style = (exists("g:erlang_old_style_highlight") && \g:erlang_old_style_highlight == 1) " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link " Comments -HiLink erlangComment Comment -HiLink erlangCommentAnnotation Special -HiLink erlangTodo Todo -HiLink erlangShebang Comment +hi def link erlangComment Comment +hi def link erlangCommentAnnotation Special +hi def link erlangTodo Todo +hi def link erlangShebang Comment " Numbers -HiLink erlangNumberInteger Number -HiLink erlangNumberFloat Float +hi def link erlangNumberInteger Number +hi def link erlangNumberFloat Float " Strings, atoms, characters -HiLink erlangString String +hi def link erlangString String if s:old_style -HiLink erlangQuotedAtom Type +hi def link erlangQuotedAtom Type else -HiLink erlangQuotedAtom String +hi def link erlangQuotedAtom String endif -HiLink erlangStringModifier Special -HiLink erlangQuotedAtomModifier Special -HiLink erlangModifier Special +hi def link erlangStringModifier Special +hi def link erlangQuotedAtomModifier Special +hi def link erlangModifier Special " Operators, separators -HiLink erlangOperator Operator -HiLink erlangRightArrow Operator +hi def link erlangOperator Operator +hi def link erlangRightArrow Operator if s:old_style -HiLink erlangBracket Normal -HiLink erlangPipe Normal +hi def link erlangBracket Normal +hi def link erlangPipe Normal else -HiLink erlangBracket Delimiter -HiLink erlangPipe Delimiter +hi def link erlangBracket Delimiter +hi def link erlangPipe Delimiter endif " Atoms, functions, variables, macros if s:old_style -HiLink erlangAtom Normal -HiLink erlangLocalFuncCall Normal -HiLink erlangLocalFuncRef Normal -HiLink erlangGlobalFuncCall Function -HiLink erlangGlobalFuncRef Function -HiLink erlangVariable Normal -HiLink erlangMacro Normal -HiLink erlangRecord Normal +hi def link erlangAtom Normal +hi def link erlangLocalFuncCall Normal +hi def link erlangLocalFuncRef Normal +hi def link erlangGlobalFuncCall Function +hi def link erlangGlobalFuncRef Function +hi def link erlangVariable Normal +hi def link erlangMacro Normal +hi def link erlangRecord Normal else -HiLink erlangAtom String -HiLink erlangLocalFuncCall Normal -HiLink erlangLocalFuncRef Normal -HiLink erlangGlobalFuncCall Normal -HiLink erlangGlobalFuncRef Normal -HiLink erlangVariable Identifier -HiLink erlangMacro Macro -HiLink erlangRecord Structure +hi def link erlangAtom String +hi def link erlangLocalFuncCall Normal +hi def link erlangLocalFuncRef Normal +hi def link erlangGlobalFuncCall Normal +hi def link erlangGlobalFuncRef Normal +hi def link erlangVariable Identifier +hi def link erlangMacro Macro +hi def link erlangRecord Structure endif " Bitstrings if !s:old_style -HiLink erlangBitType Type +hi def link erlangBitType Type endif " Constants and Directives if s:old_style -HiLink erlangAttribute Type -HiLink erlangMacroDef Type -HiLink erlangUnknownAttribute Normal -HiLink erlangInclude Type -HiLink erlangRecordDef Type -HiLink erlangDefine Type -HiLink erlangPreCondit Type -HiLink erlangType Type +hi def link erlangAttribute Type +hi def link erlangMacroDef Type +hi def link erlangUnknownAttribute Normal +hi def link erlangInclude Type +hi def link erlangRecordDef Type +hi def link erlangDefine Type +hi def link erlangPreCondit Type +hi def link erlangType Type else -HiLink erlangAttribute Keyword -HiLink erlangMacroDef Macro -HiLink erlangUnknownAttribute Normal -HiLink erlangInclude Include -HiLink erlangRecordDef Keyword -HiLink erlangDefine Define -HiLink erlangPreCondit PreCondit -HiLink erlangType Type +hi def link erlangAttribute Keyword +hi def link erlangMacroDef Macro +hi def link erlangUnknownAttribute Normal +hi def link erlangInclude Include +hi def link erlangRecordDef Keyword +hi def link erlangDefine Define +hi def link erlangPreCondit PreCondit +hi def link erlangType Type endif " Keywords -HiLink erlangKeyword Keyword +hi def link erlangKeyword Keyword " Build-in-functions (BIFs) -HiLink erlangBIF Function +hi def link erlangBIF Function if s:old_style -HiLink erlangBoolean Statement -HiLink erlangExtra Statement -HiLink erlangSignal Statement +hi def link erlangBoolean Statement +hi def link erlangExtra Statement +hi def link erlangSignal Statement else -HiLink erlangBoolean Boolean -HiLink erlangExtra Statement -HiLink erlangSignal Statement +hi def link erlangBoolean Boolean +hi def link erlangExtra Statement +hi def link erlangSignal Statement endif -delcommand HiLink let b:current_syntax = "erlang" -- cgit