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/expect.vim | 57 +++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 34 deletions(-) (limited to 'runtime/syntax/expect.vim') diff --git a/runtime/syntax/expect.vim b/runtime/syntax/expect.vim index 6ff7d4142c..4f05259fc1 100644 --- a/runtime/syntax/expect.vim +++ b/runtime/syntax/expect.vim @@ -4,11 +4,8 @@ " Last Change: 2012 Jun 01 " (Dominique Pelle added @Spell) -" 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 @@ -81,35 +78,27 @@ syn match expectComment "#.*$" contains=@Spell,expectTodo syn match expectSharpBang "\%^#!.*" " 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_expect_syntax_inits") - if version < 508 - let did_expect_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink expectSharpBang PreProc - HiLink expectVariables Special - HiLink expectCommand Function - HiLink expectStatement Statement - HiLink expectConditional Conditional - HiLink expectRepeat Repeat - HiLink expectExpectOpts Keyword - HiLink expectOutVar Special - HiLink expectSpecial Special - HiLink expectNumber Number - - HiLink expectString String - - HiLink expectComment Comment - HiLink expectTodo Todo - "HiLink expectIdentifier Identifier - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink expectSharpBang PreProc +HiLink expectVariables Special +HiLink expectCommand Function +HiLink expectStatement Statement +HiLink expectConditional Conditional +HiLink expectRepeat Repeat +HiLink expectExpectOpts Keyword +HiLink expectOutVar Special +HiLink expectSpecial Special +HiLink expectNumber Number + +HiLink expectString String + +HiLink expectComment Comment +HiLink expectTodo Todo +"HiLink expectIdentifier Identifier + +delcommand HiLink let b:current_syntax = "expect" -- 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/expect.vim | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'runtime/syntax/expect.vim') diff --git a/runtime/syntax/expect.vim b/runtime/syntax/expect.vim index 4f05259fc1..75cbd3eddf 100644 --- a/runtime/syntax/expect.vim +++ b/runtime/syntax/expect.vim @@ -79,26 +79,24 @@ syn match expectSharpBang "\%^#!.*" " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link - -HiLink expectSharpBang PreProc -HiLink expectVariables Special -HiLink expectCommand Function -HiLink expectStatement Statement -HiLink expectConditional Conditional -HiLink expectRepeat Repeat -HiLink expectExpectOpts Keyword -HiLink expectOutVar Special -HiLink expectSpecial Special -HiLink expectNumber Number - -HiLink expectString String - -HiLink expectComment Comment -HiLink expectTodo Todo -"HiLink expectIdentifier Identifier - -delcommand HiLink + +hi def link expectSharpBang PreProc +hi def link expectVariables Special +hi def link expectCommand Function +hi def link expectStatement Statement +hi def link expectConditional Conditional +hi def link expectRepeat Repeat +hi def link expectExpectOpts Keyword +hi def link expectOutVar Special +hi def link expectSpecial Special +hi def link expectNumber Number + +hi def link expectString String + +hi def link expectComment Comment +hi def link expectTodo Todo +"hi def link expectIdentifier Identifier + let b:current_syntax = "expect" -- cgit