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/csh.vim | 98 +++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 57 deletions(-) (limited to 'runtime/syntax/csh.vim') diff --git a/runtime/syntax/csh.vim b/runtime/syntax/csh.vim index 9dc2c4ef56..973a3550dc 100644 --- a/runtime/syntax/csh.vim +++ b/runtime/syntax/csh.vim @@ -5,11 +5,8 @@ " Version: 11 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_CSH -" 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 @@ -100,60 +97,47 @@ syn match cshNumber "-\=\<\d\+\>" "syn match cshIdentifier "\<[a-zA-Z._][a-zA-Z0-9._]*\>" " Shell Input Redirection (Here Documents) -if version < 600 - syn region cshHereDoc matchgroup=cshRedir start="<<-\=\s*\**END[a-zA-Z_0-9]*\**" matchgroup=cshRedir end="^END[a-zA-Z_0-9]*$" - syn region cshHereDoc matchgroup=cshRedir start="<<-\=\s*\**EOF\**" matchgroup=cshRedir end="^EOF$" -else - syn region cshHereDoc matchgroup=cshRedir start="<<-\=\s*\**\z(\h\w*\)\**" matchgroup=cshRedir end="^\z1$" -endif +syn region cshHereDoc matchgroup=cshRedir start="<<-\=\s*\**\z(\h\w*\)\**" matchgroup=cshRedir end="^\z1$" " 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_csh_syntax_inits") - if version < 508 - let did_csh_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink cshArgv cshVariables - HiLink cshBckQuote cshCommand - HiLink cshDblQuote cshString - HiLink cshExtVar cshVariables - HiLink cshHereDoc cshString - HiLink cshNoEndlineBQ cshNoEndline - HiLink cshNoEndlineDQ cshNoEndline - HiLink cshNoEndlineSQ cshNoEndline - HiLink cshQtyWord cshVariables - HiLink cshRedir cshOperator - HiLink cshSelector cshVariables - HiLink cshSetStmt cshStatement - HiLink cshSetVariables cshVariables - HiLink cshSnglQuote cshString - HiLink cshSubst cshVariables - - HiLink cshCommand Statement - HiLink cshComment Comment - HiLink cshConditional Conditional - HiLink cshIdentifier Error - HiLink cshModifier Special - HiLink cshNoEndline Error - HiLink cshNumber Number - HiLink cshOperator Operator - HiLink cshRedir Statement - HiLink cshRepeat Repeat - HiLink cshShellVariables Special - HiLink cshSpecial Special - HiLink cshStatement Statement - HiLink cshString String - HiLink cshSubstError Error - HiLink cshTodo Todo - HiLink cshVariables Type - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink cshArgv cshVariables +HiLink cshBckQuote cshCommand +HiLink cshDblQuote cshString +HiLink cshExtVar cshVariables +HiLink cshHereDoc cshString +HiLink cshNoEndlineBQ cshNoEndline +HiLink cshNoEndlineDQ cshNoEndline +HiLink cshNoEndlineSQ cshNoEndline +HiLink cshQtyWord cshVariables +HiLink cshRedir cshOperator +HiLink cshSelector cshVariables +HiLink cshSetStmt cshStatement +HiLink cshSetVariables cshVariables +HiLink cshSnglQuote cshString +HiLink cshSubst cshVariables + +HiLink cshCommand Statement +HiLink cshComment Comment +HiLink cshConditional Conditional +HiLink cshIdentifier Error +HiLink cshModifier Special +HiLink cshNoEndline Error +HiLink cshNumber Number +HiLink cshOperator Operator +HiLink cshRedir Statement +HiLink cshRepeat Repeat +HiLink cshShellVariables Special +HiLink cshSpecial Special +HiLink cshStatement Statement +HiLink cshString String +HiLink cshSubstError Error +HiLink cshTodo Todo +HiLink cshVariables Type + +delcommand HiLink let b:current_syntax = "csh" -- 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/csh.vim | 79 +++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 40 deletions(-) (limited to 'runtime/syntax/csh.vim') diff --git a/runtime/syntax/csh.vim b/runtime/syntax/csh.vim index 973a3550dc..c134aa7ef3 100644 --- a/runtime/syntax/csh.vim +++ b/runtime/syntax/csh.vim @@ -1,8 +1,8 @@ " Vim syntax file " Language: C-shell (csh) " Maintainer: Charles E. Campbell -" Last Change: Oct 23, 2014 -" Version: 11 +" Last Change: Aug 31, 2016 +" Version: 13 " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_CSH " quit when a syntax file was already loaded @@ -100,44 +100,43 @@ syn match cshNumber "-\=\<\d\+\>" syn region cshHereDoc matchgroup=cshRedir start="<<-\=\s*\**\z(\h\w*\)\**" matchgroup=cshRedir end="^\z1$" " Define the default highlighting. -" Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link - -HiLink cshArgv cshVariables -HiLink cshBckQuote cshCommand -HiLink cshDblQuote cshString -HiLink cshExtVar cshVariables -HiLink cshHereDoc cshString -HiLink cshNoEndlineBQ cshNoEndline -HiLink cshNoEndlineDQ cshNoEndline -HiLink cshNoEndlineSQ cshNoEndline -HiLink cshQtyWord cshVariables -HiLink cshRedir cshOperator -HiLink cshSelector cshVariables -HiLink cshSetStmt cshStatement -HiLink cshSetVariables cshVariables -HiLink cshSnglQuote cshString -HiLink cshSubst cshVariables - -HiLink cshCommand Statement -HiLink cshComment Comment -HiLink cshConditional Conditional -HiLink cshIdentifier Error -HiLink cshModifier Special -HiLink cshNoEndline Error -HiLink cshNumber Number -HiLink cshOperator Operator -HiLink cshRedir Statement -HiLink cshRepeat Repeat -HiLink cshShellVariables Special -HiLink cshSpecial Special -HiLink cshStatement Statement -HiLink cshString String -HiLink cshSubstError Error -HiLink cshTodo Todo -HiLink cshVariables Type - -delcommand HiLink +if !exists("skip_csh_syntax_inits") + + hi def link cshArgv cshVariables + hi def link cshBckQuote cshCommand + hi def link cshDblQuote cshString + hi def link cshExtVar cshVariables + hi def link cshHereDoc cshString + hi def link cshNoEndlineBQ cshNoEndline + hi def link cshNoEndlineDQ cshNoEndline + hi def link cshNoEndlineSQ cshNoEndline + hi def link cshQtyWord cshVariables + hi def link cshRedir cshOperator + hi def link cshSelector cshVariables + hi def link cshSetStmt cshStatement + hi def link cshSetVariables cshVariables + hi def link cshSnglQuote cshString + hi def link cshSubst cshVariables + + hi def link cshCommand Statement + hi def link cshComment Comment + hi def link cshConditional Conditional + hi def link cshIdentifier Error + hi def link cshModifier Special + hi def link cshNoEndline Error + hi def link cshNumber Number + hi def link cshOperator Operator + hi def link cshRedir Statement + hi def link cshRepeat Repeat + hi def link cshShellVariables Special + hi def link cshSpecial Special + hi def link cshStatement Statement + hi def link cshString String + hi def link cshSubstError Error + hi def link cshTodo Todo + hi def link cshVariables Type + +endif let b:current_syntax = "csh" -- cgit