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/htmlos.vim | 79 +++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 47 deletions(-) (limited to 'runtime/syntax/htmlos.vim') diff --git a/runtime/syntax/htmlos.vim b/runtime/syntax/htmlos.vim index f31b9f6543..530c046bac 100644 --- a/runtime/syntax/htmlos.vim +++ b/runtime/syntax/htmlos.vim @@ -6,11 +6,8 @@ " Last Change: 2003 May 11 " -" 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 @@ -18,12 +15,8 @@ if !exists("main_syntax") let main_syntax = 'htmlos' endif -if version < 600 - so :p:h/html.vim -else - runtime! syntax/html.vim - unlet b:current_syntax -endif +runtime! syntax/html.vim +unlet b:current_syntax syn cluster htmlPreproc add=htmlosRegion @@ -121,42 +114,34 @@ else endif " 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_htmlos_syn_inits") - if version < 508 - let did_htmlos_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - " The default methods for highlighting. Can be overridden later - HiLink htmlosSpecialIdentifier Operator - HiLink htmlosIdentifier Identifier - HiLink htmlosStorageClass StorageClass - HiLink htmlosComment Comment - HiLink htmlosBoolean Boolean - HiLink htmlosStringSingle String - HiLink htmlosStringDouble String - HiLink htmlosNumber Number - HiLink htmlosFloat Float - HiLink htmlosFunctions Function - HiLink htmlosRepeat Repeat - HiLink htmlosConditional Conditional - HiLink htmlosLabel Label - HiLink htmlosStatement Statement - HiLink htmlosKeyword Statement - HiLink htmlosType Type - HiLink htmlosDefine Define - HiLink htmlosParent Delimiter - HiLink htmlosError Error - HiLink htmlosTodo Todo - HiLink htmlosOperator Operator - HiLink htmlosRelation Operator - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +" The default methods for highlighting. Can be overridden later +HiLink htmlosSpecialIdentifier Operator +HiLink htmlosIdentifier Identifier +HiLink htmlosStorageClass StorageClass +HiLink htmlosComment Comment +HiLink htmlosBoolean Boolean +HiLink htmlosStringSingle String +HiLink htmlosStringDouble String +HiLink htmlosNumber Number +HiLink htmlosFloat Float +HiLink htmlosFunctions Function +HiLink htmlosRepeat Repeat +HiLink htmlosConditional Conditional +HiLink htmlosLabel Label +HiLink htmlosStatement Statement +HiLink htmlosKeyword Statement +HiLink htmlosType Type +HiLink htmlosDefine Define +HiLink htmlosParent Delimiter +HiLink htmlosError Error +HiLink htmlosTodo Todo +HiLink htmlosOperator Operator +HiLink htmlosRelation Operator + +delcommand HiLink let b:current_syntax = "htmlos" if main_syntax == 'htmlos' -- 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/htmlos.vim | 48 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 25 deletions(-) (limited to 'runtime/syntax/htmlos.vim') diff --git a/runtime/syntax/htmlos.vim b/runtime/syntax/htmlos.vim index 530c046bac..b54ca7a921 100644 --- a/runtime/syntax/htmlos.vim +++ b/runtime/syntax/htmlos.vim @@ -115,33 +115,31 @@ endif " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link " The default methods for highlighting. Can be overridden later -HiLink htmlosSpecialIdentifier Operator -HiLink htmlosIdentifier Identifier -HiLink htmlosStorageClass StorageClass -HiLink htmlosComment Comment -HiLink htmlosBoolean Boolean -HiLink htmlosStringSingle String -HiLink htmlosStringDouble String -HiLink htmlosNumber Number -HiLink htmlosFloat Float -HiLink htmlosFunctions Function -HiLink htmlosRepeat Repeat -HiLink htmlosConditional Conditional -HiLink htmlosLabel Label -HiLink htmlosStatement Statement -HiLink htmlosKeyword Statement -HiLink htmlosType Type -HiLink htmlosDefine Define -HiLink htmlosParent Delimiter -HiLink htmlosError Error -HiLink htmlosTodo Todo -HiLink htmlosOperator Operator -HiLink htmlosRelation Operator - -delcommand HiLink +hi def link htmlosSpecialIdentifier Operator +hi def link htmlosIdentifier Identifier +hi def link htmlosStorageClass StorageClass +hi def link htmlosComment Comment +hi def link htmlosBoolean Boolean +hi def link htmlosStringSingle String +hi def link htmlosStringDouble String +hi def link htmlosNumber Number +hi def link htmlosFloat Float +hi def link htmlosFunctions Function +hi def link htmlosRepeat Repeat +hi def link htmlosConditional Conditional +hi def link htmlosLabel Label +hi def link htmlosStatement Statement +hi def link htmlosKeyword Statement +hi def link htmlosType Type +hi def link htmlosDefine Define +hi def link htmlosParent Delimiter +hi def link htmlosError Error +hi def link htmlosTodo Todo +hi def link htmlosOperator Operator +hi def link htmlosRelation Operator + let b:current_syntax = "htmlos" if main_syntax == 'htmlos' -- cgit