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/lifelines.vim | 77 +++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 44 deletions(-) (limited to 'runtime/syntax/lifelines.vim') diff --git a/runtime/syntax/lifelines.vim b/runtime/syntax/lifelines.vim index f8bea015bd..041c50963d 100644 --- a/runtime/syntax/lifelines.vim +++ b/runtime/syntax/lifelines.vim @@ -11,9 +11,8 @@ " 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 @@ -110,9 +109,7 @@ syn match lifelinesNumber "-\=\<\d\+\.\d*\>" syn match lifelinesNumber "-\=\.\d\+\>" " folding using {} -if version >= 600 - syn region lifelinesFoldBlock start="{" end="}" transparent fold -endif +syn region lifelinesFoldBlock start="{" end="}" transparent fold "catch errors caused by wrong parenthesis "adapted from original c.vim written by Bram Moolenaar @@ -123,44 +120,36 @@ syn match lifelinesParenError ")" syn match lifelinesErrInParen contained "[{}]" " 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_lifelines_syn_inits") - if version < 508 - let did_lifelines_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink lifelinesConditional Conditional - HiLink lifelinesArithm Operator - HiLink lifelinesLogical Conditional - HiLink lifelinesInclude Include - HiLink lifelinesComment Comment - HiLink lifelinesStatement Statement - HiLink lifelinesUser Statement - HiLink lifelinesFunct Statement - HiLink lifelinesTable Statement - HiLink lifelinesGedcom Statement - HiLink lifelinesList Statement - HiLink lifelinesRepeat Repeat - HiLink lifelinesFam Statement - HiLink lifelinesIndi Statement - HiLink lifelinesProc Statement - HiLink lifelinesDef Statement - HiLink lifelinesString String - HiLink lifelinesSpecial Special - HiLink lifelinesNumber Number - HiLink lifelinesParenError Error - HiLink lifelinesErrInParen Error - HiLink lifelinesError Error - HiLink lifelinesTodo Todo - HiLink lifelinesDecl PreProc - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet + +command -nargs=+ HiLink hi def link + +HiLink lifelinesConditional Conditional +HiLink lifelinesArithm Operator +HiLink lifelinesLogical Conditional +HiLink lifelinesInclude Include +HiLink lifelinesComment Comment +HiLink lifelinesStatement Statement +HiLink lifelinesUser Statement +HiLink lifelinesFunct Statement +HiLink lifelinesTable Statement +HiLink lifelinesGedcom Statement +HiLink lifelinesList Statement +HiLink lifelinesRepeat Repeat +HiLink lifelinesFam Statement +HiLink lifelinesIndi Statement +HiLink lifelinesProc Statement +HiLink lifelinesDef Statement +HiLink lifelinesString String +HiLink lifelinesSpecial Special +HiLink lifelinesNumber Number +HiLink lifelinesParenError Error +HiLink lifelinesErrInParen Error +HiLink lifelinesError Error +HiLink lifelinesTodo Todo +HiLink lifelinesDecl PreProc + +delcommand HiLink let b:current_syntax = "lifelines" -- 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/lifelines.vim | 54 +++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'runtime/syntax/lifelines.vim') diff --git a/runtime/syntax/lifelines.vim b/runtime/syntax/lifelines.vim index 041c50963d..ff4692888e 100644 --- a/runtime/syntax/lifelines.vim +++ b/runtime/syntax/lifelines.vim @@ -122,34 +122,32 @@ syn match lifelinesErrInParen contained "[{}]" " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link - -HiLink lifelinesConditional Conditional -HiLink lifelinesArithm Operator -HiLink lifelinesLogical Conditional -HiLink lifelinesInclude Include -HiLink lifelinesComment Comment -HiLink lifelinesStatement Statement -HiLink lifelinesUser Statement -HiLink lifelinesFunct Statement -HiLink lifelinesTable Statement -HiLink lifelinesGedcom Statement -HiLink lifelinesList Statement -HiLink lifelinesRepeat Repeat -HiLink lifelinesFam Statement -HiLink lifelinesIndi Statement -HiLink lifelinesProc Statement -HiLink lifelinesDef Statement -HiLink lifelinesString String -HiLink lifelinesSpecial Special -HiLink lifelinesNumber Number -HiLink lifelinesParenError Error -HiLink lifelinesErrInParen Error -HiLink lifelinesError Error -HiLink lifelinesTodo Todo -HiLink lifelinesDecl PreProc - -delcommand HiLink + +hi def link lifelinesConditional Conditional +hi def link lifelinesArithm Operator +hi def link lifelinesLogical Conditional +hi def link lifelinesInclude Include +hi def link lifelinesComment Comment +hi def link lifelinesStatement Statement +hi def link lifelinesUser Statement +hi def link lifelinesFunct Statement +hi def link lifelinesTable Statement +hi def link lifelinesGedcom Statement +hi def link lifelinesList Statement +hi def link lifelinesRepeat Repeat +hi def link lifelinesFam Statement +hi def link lifelinesIndi Statement +hi def link lifelinesProc Statement +hi def link lifelinesDef Statement +hi def link lifelinesString String +hi def link lifelinesSpecial Special +hi def link lifelinesNumber Number +hi def link lifelinesParenError Error +hi def link lifelinesErrInParen Error +hi def link lifelinesError Error +hi def link lifelinesTodo Todo +hi def link lifelinesDecl PreProc + let b:current_syntax = "lifelines" -- cgit