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/fdcc.vim | 99 ++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 55 deletions(-) (limited to 'runtime/syntax/fdcc.vim') diff --git a/runtime/syntax/fdcc.vim b/runtime/syntax/fdcc.vim index 38717ebfb8..422fd31dae 100644 --- a/runtime/syntax/fdcc.vim +++ b/runtime/syntax/fdcc.vim @@ -4,11 +4,8 @@ " Last Change: 2004 May 16 " Remarks: FDCC (Formal Definitions of Cultural Conventions) see ISO TR 14652 -" 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 @@ -58,56 +55,48 @@ syn region fdccBlank matchgroup=fdccLCName start=/^LC_NAME$/ end=/^END LC_NAME$/ syn region fdccBlank matchgroup=fdccLCAddress start=/^LC_ADDRESS$/ end=/^END LC_ADDRESS$/ contains=fdccKeywordAddress,fdccString,fdccComment,fdccNumber -" 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_fdcc_syn_inits") - if version < 508 - let did_fdcc_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink fdccBlank Blank - - HiLink fdccTodo Todo - HiLink fdccComment Comment - HiLink fdccVariable Type - - HiLink fdccLCIdentification Statement - HiLink fdccLCCtype Statement - HiLink fdccLCCollate Statement - HiLink fdccLCMonetary Statement - HiLink fdccLCNumeric Statement - HiLink fdccLCTime Statement - HiLink fdccLCMessages Statement - HiLink fdccLCPaper Statement - HiLink fdccLCTelephone Statement - HiLink fdccLCMeasurement Statement - HiLink fdccLCName Statement - HiLink fdccLCAddress Statement - - HiLink fdccUnicodeInValid Error - HiLink fdccUnicodeValid String - HiLink fdccString String - HiLink fdccNumber Blank - - HiLink fdccKeywordIdentification fdccKeyword - HiLink fdccKeywordCtype fdccKeyword - HiLink fdccKeywordCollate fdccKeyword - HiLink fdccKeywordMonetary fdccKeyword - HiLink fdccKeywordNumeric fdccKeyword - HiLink fdccKeywordTime fdccKeyword - HiLink fdccKeywordMessages fdccKeyword - HiLink fdccKeywordPaper fdccKeyword - HiLink fdccKeywordTelephone fdccKeyword - HiLink fdccKeywordMeasurement fdccKeyword - HiLink fdccKeywordName fdccKeyword - HiLink fdccKeywordAddress fdccKeyword - HiLink fdccKeyword Identifier - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink fdccBlank Blank + +HiLink fdccTodo Todo +HiLink fdccComment Comment +HiLink fdccVariable Type + +HiLink fdccLCIdentification Statement +HiLink fdccLCCtype Statement +HiLink fdccLCCollate Statement +HiLink fdccLCMonetary Statement +HiLink fdccLCNumeric Statement +HiLink fdccLCTime Statement +HiLink fdccLCMessages Statement +HiLink fdccLCPaper Statement +HiLink fdccLCTelephone Statement +HiLink fdccLCMeasurement Statement +HiLink fdccLCName Statement +HiLink fdccLCAddress Statement + +HiLink fdccUnicodeInValid Error +HiLink fdccUnicodeValid String +HiLink fdccString String +HiLink fdccNumber Blank + +HiLink fdccKeywordIdentification fdccKeyword +HiLink fdccKeywordCtype fdccKeyword +HiLink fdccKeywordCollate fdccKeyword +HiLink fdccKeywordMonetary fdccKeyword +HiLink fdccKeywordNumeric fdccKeyword +HiLink fdccKeywordTime fdccKeyword +HiLink fdccKeywordMessages fdccKeyword +HiLink fdccKeywordPaper fdccKeyword +HiLink fdccKeywordTelephone fdccKeyword +HiLink fdccKeywordMeasurement fdccKeyword +HiLink fdccKeywordName fdccKeyword +HiLink fdccKeywordAddress fdccKeyword +HiLink fdccKeyword Identifier + +delcommand HiLink let b:current_syntax = "fdcc" -- 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/fdcc.vim | 80 ++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 41 deletions(-) (limited to 'runtime/syntax/fdcc.vim') diff --git a/runtime/syntax/fdcc.vim b/runtime/syntax/fdcc.vim index 422fd31dae..f7b296b9c6 100644 --- a/runtime/syntax/fdcc.vim +++ b/runtime/syntax/fdcc.vim @@ -56,47 +56,45 @@ syn region fdccBlank matchgroup=fdccLCAddress start=/^LC_ADDRESS$/ end=/^END LC_ " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link - -HiLink fdccBlank Blank - -HiLink fdccTodo Todo -HiLink fdccComment Comment -HiLink fdccVariable Type - -HiLink fdccLCIdentification Statement -HiLink fdccLCCtype Statement -HiLink fdccLCCollate Statement -HiLink fdccLCMonetary Statement -HiLink fdccLCNumeric Statement -HiLink fdccLCTime Statement -HiLink fdccLCMessages Statement -HiLink fdccLCPaper Statement -HiLink fdccLCTelephone Statement -HiLink fdccLCMeasurement Statement -HiLink fdccLCName Statement -HiLink fdccLCAddress Statement - -HiLink fdccUnicodeInValid Error -HiLink fdccUnicodeValid String -HiLink fdccString String -HiLink fdccNumber Blank - -HiLink fdccKeywordIdentification fdccKeyword -HiLink fdccKeywordCtype fdccKeyword -HiLink fdccKeywordCollate fdccKeyword -HiLink fdccKeywordMonetary fdccKeyword -HiLink fdccKeywordNumeric fdccKeyword -HiLink fdccKeywordTime fdccKeyword -HiLink fdccKeywordMessages fdccKeyword -HiLink fdccKeywordPaper fdccKeyword -HiLink fdccKeywordTelephone fdccKeyword -HiLink fdccKeywordMeasurement fdccKeyword -HiLink fdccKeywordName fdccKeyword -HiLink fdccKeywordAddress fdccKeyword -HiLink fdccKeyword Identifier - -delcommand HiLink + +hi def link fdccBlank Blank + +hi def link fdccTodo Todo +hi def link fdccComment Comment +hi def link fdccVariable Type + +hi def link fdccLCIdentification Statement +hi def link fdccLCCtype Statement +hi def link fdccLCCollate Statement +hi def link fdccLCMonetary Statement +hi def link fdccLCNumeric Statement +hi def link fdccLCTime Statement +hi def link fdccLCMessages Statement +hi def link fdccLCPaper Statement +hi def link fdccLCTelephone Statement +hi def link fdccLCMeasurement Statement +hi def link fdccLCName Statement +hi def link fdccLCAddress Statement + +hi def link fdccUnicodeInValid Error +hi def link fdccUnicodeValid String +hi def link fdccString String +hi def link fdccNumber Blank + +hi def link fdccKeywordIdentification fdccKeyword +hi def link fdccKeywordCtype fdccKeyword +hi def link fdccKeywordCollate fdccKeyword +hi def link fdccKeywordMonetary fdccKeyword +hi def link fdccKeywordNumeric fdccKeyword +hi def link fdccKeywordTime fdccKeyword +hi def link fdccKeywordMessages fdccKeyword +hi def link fdccKeywordPaper fdccKeyword +hi def link fdccKeywordTelephone fdccKeyword +hi def link fdccKeywordMeasurement fdccKeyword +hi def link fdccKeywordName fdccKeyword +hi def link fdccKeywordAddress fdccKeyword +hi def link fdccKeyword Identifier + let b:current_syntax = "fdcc" -- cgit