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/sather.vim | 73 ++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 42 deletions(-) (limited to 'runtime/syntax/sather.vim') diff --git a/runtime/syntax/sather.vim b/runtime/syntax/sather.vim index 103cf0b8cd..bc35ba2dcf 100644 --- a/runtime/syntax/sather.vim +++ b/runtime/syntax/sather.vim @@ -9,11 +9,8 @@ " Homepage: http://www.icsi.berkeley.edu/~sather " Sather files use .sa as suffix -" 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 @@ -61,44 +58,36 @@ syn match satherComment "--.*" contains=satherComment2String,satherCharacter syn sync ccomment satherComment " 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_sather_syn_inits") - if version < 508 - let did_sather_syn_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 satherBranch satherStatement - HiLink satherLabel satherStatement - HiLink satherConditional satherStatement - HiLink satherSynchronize satherStatement - HiLink satherRepeat satherStatement - HiLink satherExceptions satherStatement - HiLink satherStorageClass satherDeclarative - HiLink satherMethodDecl satherDeclarative - HiLink satherClassDecl satherDeclarative - HiLink satherScopeDecl satherDeclarative - HiLink satherBoolValue satherValue - HiLink satherSpecial satherValue - HiLink satherString satherValue - HiLink satherCharacter satherValue - HiLink satherSpecialCharacter satherValue - HiLink satherNumber satherValue - HiLink satherStatement Statement - HiLink satherOperator Statement - HiLink satherComment Comment - HiLink satherType Type - HiLink satherValue String - HiLink satherString String - HiLink satherSpecial String - HiLink satherCharacter String - HiLink satherDeclarative Type - HiLink satherExternal PreCondit - delcommand HiLink -endif +HiLink satherBranch satherStatement +HiLink satherLabel satherStatement +HiLink satherConditional satherStatement +HiLink satherSynchronize satherStatement +HiLink satherRepeat satherStatement +HiLink satherExceptions satherStatement +HiLink satherStorageClass satherDeclarative +HiLink satherMethodDecl satherDeclarative +HiLink satherClassDecl satherDeclarative +HiLink satherScopeDecl satherDeclarative +HiLink satherBoolValue satherValue +HiLink satherSpecial satherValue +HiLink satherString satherValue +HiLink satherCharacter satherValue +HiLink satherSpecialCharacter satherValue +HiLink satherNumber satherValue +HiLink satherStatement Statement +HiLink satherOperator Statement +HiLink satherComment Comment +HiLink satherType Type +HiLink satherValue String +HiLink satherString String +HiLink satherSpecial String +HiLink satherCharacter String +HiLink satherDeclarative Type +HiLink satherExternal PreCondit +delcommand HiLink let b:current_syntax = "sather" -- 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/sather.vim | 54 +++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'runtime/syntax/sather.vim') diff --git a/runtime/syntax/sather.vim b/runtime/syntax/sather.vim index bc35ba2dcf..baa3a825d8 100644 --- a/runtime/syntax/sather.vim +++ b/runtime/syntax/sather.vim @@ -59,35 +59,33 @@ syn sync ccomment satherComment " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link -HiLink satherBranch satherStatement -HiLink satherLabel satherStatement -HiLink satherConditional satherStatement -HiLink satherSynchronize satherStatement -HiLink satherRepeat satherStatement -HiLink satherExceptions satherStatement -HiLink satherStorageClass satherDeclarative -HiLink satherMethodDecl satherDeclarative -HiLink satherClassDecl satherDeclarative -HiLink satherScopeDecl satherDeclarative -HiLink satherBoolValue satherValue -HiLink satherSpecial satherValue -HiLink satherString satherValue -HiLink satherCharacter satherValue -HiLink satherSpecialCharacter satherValue -HiLink satherNumber satherValue -HiLink satherStatement Statement -HiLink satherOperator Statement -HiLink satherComment Comment -HiLink satherType Type -HiLink satherValue String -HiLink satherString String -HiLink satherSpecial String -HiLink satherCharacter String -HiLink satherDeclarative Type -HiLink satherExternal PreCondit -delcommand HiLink +hi def link satherBranch satherStatement +hi def link satherLabel satherStatement +hi def link satherConditional satherStatement +hi def link satherSynchronize satherStatement +hi def link satherRepeat satherStatement +hi def link satherExceptions satherStatement +hi def link satherStorageClass satherDeclarative +hi def link satherMethodDecl satherDeclarative +hi def link satherClassDecl satherDeclarative +hi def link satherScopeDecl satherDeclarative +hi def link satherBoolValue satherValue +hi def link satherSpecial satherValue +hi def link satherString satherValue +hi def link satherCharacter satherValue +hi def link satherSpecialCharacter satherValue +hi def link satherNumber satherValue +hi def link satherStatement Statement +hi def link satherOperator Statement +hi def link satherComment Comment +hi def link satherType Type +hi def link satherValue String +hi def link satherString String +hi def link satherSpecial String +hi def link satherCharacter String +hi def link satherDeclarative Type +hi def link satherExternal PreCondit let b:current_syntax = "sather" -- cgit