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/chill.vim | 121 +++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 66 deletions(-) (limited to 'runtime/syntax/chill.vim') diff --git a/runtime/syntax/chill.vim b/runtime/syntax/chill.vim index e5200fe722..6ccb32c4c3 100644 --- a/runtime/syntax/chill.vim +++ b/runtime/syntax/chill.vim @@ -11,11 +11,8 @@ " & Communications LTd.) -" 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 @@ -124,67 +121,59 @@ endif exec "syn sync ccomment chillComment minlines=" . chill_minlines " 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_ch_syntax_inits") - if version < 508 - let did_ch_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink chillLabel Label - HiLink chillUserLabel Label - HiLink chillConditional Conditional - " hi chillConditional term=bold ctermfg=red guifg=red gui=bold - - HiLink chillRepeat Repeat - HiLink chillProcess Repeat - HiLink chillSignal Repeat - HiLink chillCharacter Character - HiLink chillSpecialCharacter chillSpecial - HiLink chillNumber Number - HiLink chillFloat Float - HiLink chillOctalError chillError - HiLink chillParenError chillError - HiLink chillInParen chillError - HiLink chillCommentError chillError - HiLink chillSpaceError chillError - HiLink chillOperator Operator - HiLink chillStructure Structure - HiLink chillBlock Operator - HiLink chillScope Operator - "hi chillEDML term=underline ctermfg=DarkRed guifg=Red - HiLink chillEDML PreProc - "hi chillBoolConst term=bold ctermfg=brown guifg=brown - HiLink chillBoolConst Constant - "hi chillLogical term=bold ctermfg=brown guifg=brown - HiLink chillLogical Constant - HiLink chillStorageClass StorageClass - HiLink chillInclude Include - HiLink chillPreProc PreProc - HiLink chillDefine Macro - HiLink chillIncluded chillString - HiLink chillError Error - HiLink chillStatement Statement - HiLink chillPreCondit PreCondit - HiLink chillType Type - HiLink chillCommentError chillError - HiLink chillCommentString chillString - HiLink chillComment2String chillString - HiLink chillCommentSkip chillComment - HiLink chillString String - HiLink chillComment Comment - " hi chillComment term=None ctermfg=lightblue guifg=lightblue - HiLink chillSpecial SpecialChar - HiLink chillTodo Todo - HiLink chillBlock Statement - "HiLink chillIdentifier Identifier - HiLink chillBracket Delimiter - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink chillLabel Label +HiLink chillUserLabel Label +HiLink chillConditional Conditional +" hi chillConditional term=bold ctermfg=red guifg=red gui=bold + +HiLink chillRepeat Repeat +HiLink chillProcess Repeat +HiLink chillSignal Repeat +HiLink chillCharacter Character +HiLink chillSpecialCharacter chillSpecial +HiLink chillNumber Number +HiLink chillFloat Float +HiLink chillOctalError chillError +HiLink chillParenError chillError +HiLink chillInParen chillError +HiLink chillCommentError chillError +HiLink chillSpaceError chillError +HiLink chillOperator Operator +HiLink chillStructure Structure +HiLink chillBlock Operator +HiLink chillScope Operator +"hi chillEDML term=underline ctermfg=DarkRed guifg=Red +HiLink chillEDML PreProc +"hi chillBoolConst term=bold ctermfg=brown guifg=brown +HiLink chillBoolConst Constant +"hi chillLogical term=bold ctermfg=brown guifg=brown +HiLink chillLogical Constant +HiLink chillStorageClass StorageClass +HiLink chillInclude Include +HiLink chillPreProc PreProc +HiLink chillDefine Macro +HiLink chillIncluded chillString +HiLink chillError Error +HiLink chillStatement Statement +HiLink chillPreCondit PreCondit +HiLink chillType Type +HiLink chillCommentError chillError +HiLink chillCommentString chillString +HiLink chillComment2String chillString +HiLink chillCommentSkip chillComment +HiLink chillString String +HiLink chillComment Comment +" hi chillComment term=None ctermfg=lightblue guifg=lightblue +HiLink chillSpecial SpecialChar +HiLink chillTodo Todo +HiLink chillBlock Statement +"HiLink chillIdentifier Identifier +HiLink chillBracket Delimiter + +delcommand HiLink let b:current_syntax = "chill" -- 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/chill.vim | 102 +++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 52 deletions(-) (limited to 'runtime/syntax/chill.vim') diff --git a/runtime/syntax/chill.vim b/runtime/syntax/chill.vim index 6ccb32c4c3..b95df68bc8 100644 --- a/runtime/syntax/chill.vim +++ b/runtime/syntax/chill.vim @@ -122,58 +122,56 @@ exec "syn sync ccomment chillComment minlines=" . chill_minlines " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link - -HiLink chillLabel Label -HiLink chillUserLabel Label -HiLink chillConditional Conditional -" hi chillConditional term=bold ctermfg=red guifg=red gui=bold - -HiLink chillRepeat Repeat -HiLink chillProcess Repeat -HiLink chillSignal Repeat -HiLink chillCharacter Character -HiLink chillSpecialCharacter chillSpecial -HiLink chillNumber Number -HiLink chillFloat Float -HiLink chillOctalError chillError -HiLink chillParenError chillError -HiLink chillInParen chillError -HiLink chillCommentError chillError -HiLink chillSpaceError chillError -HiLink chillOperator Operator -HiLink chillStructure Structure -HiLink chillBlock Operator -HiLink chillScope Operator -"hi chillEDML term=underline ctermfg=DarkRed guifg=Red -HiLink chillEDML PreProc -"hi chillBoolConst term=bold ctermfg=brown guifg=brown -HiLink chillBoolConst Constant -"hi chillLogical term=bold ctermfg=brown guifg=brown -HiLink chillLogical Constant -HiLink chillStorageClass StorageClass -HiLink chillInclude Include -HiLink chillPreProc PreProc -HiLink chillDefine Macro -HiLink chillIncluded chillString -HiLink chillError Error -HiLink chillStatement Statement -HiLink chillPreCondit PreCondit -HiLink chillType Type -HiLink chillCommentError chillError -HiLink chillCommentString chillString -HiLink chillComment2String chillString -HiLink chillCommentSkip chillComment -HiLink chillString String -HiLink chillComment Comment -" hi chillComment term=None ctermfg=lightblue guifg=lightblue -HiLink chillSpecial SpecialChar -HiLink chillTodo Todo -HiLink chillBlock Statement -"HiLink chillIdentifier Identifier -HiLink chillBracket Delimiter - -delcommand HiLink + +hi def link chillLabel Label +hi def link chillUserLabel Label +hi def link chillConditional Conditional +" hi def link chillConditional term=bold ctermfg=red guifg=red gui=bold + +hi def link chillRepeat Repeat +hi def link chillProcess Repeat +hi def link chillSignal Repeat +hi def link chillCharacter Character +hi def link chillSpecialCharacter chillSpecial +hi def link chillNumber Number +hi def link chillFloat Float +hi def link chillOctalError chillError +hi def link chillParenError chillError +hi def link chillInParen chillError +hi def link chillCommentError chillError +hi def link chillSpaceError chillError +hi def link chillOperator Operator +hi def link chillStructure Structure +hi def link chillBlock Operator +hi def link chillScope Operator +"hi def link chillEDML term=underline ctermfg=DarkRed guifg=Red +hi def link chillEDML PreProc +"hi def link chillBoolConst term=bold ctermfg=brown guifg=brown +hi def link chillBoolConst Constant +"hi def link chillLogical term=bold ctermfg=brown guifg=brown +hi def link chillLogical Constant +hi def link chillStorageClass StorageClass +hi def link chillInclude Include +hi def link chillPreProc PreProc +hi def link chillDefine Macro +hi def link chillIncluded chillString +hi def link chillError Error +hi def link chillStatement Statement +hi def link chillPreCondit PreCondit +hi def link chillType Type +hi def link chillCommentError chillError +hi def link chillCommentString chillString +hi def link chillComment2String chillString +hi def link chillCommentSkip chillComment +hi def link chillString String +hi def link chillComment Comment +" hi def link chillComment term=None ctermfg=lightblue guifg=lightblue +hi def link chillSpecial SpecialChar +hi def link chillTodo Todo +hi def link chillBlock Statement +"hi def link chillIdentifier Identifier +hi def link chillBracket Delimiter + let b:current_syntax = "chill" -- cgit