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/progress.vim | 77 ++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 46 deletions(-) (limited to 'runtime/syntax/progress.vim') diff --git a/runtime/syntax/progress.vim b/runtime/syntax/progress.vim index 85a54a6505..9ff506960e 100644 --- a/runtime/syntax/progress.vim +++ b/runtime/syntax/progress.vim @@ -11,22 +11,15 @@ " Version: 13 " Last Change: Nov 11 2012 -" For version 5.x: Clear all syntax item -" 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 let s:cpo_save = &cpo set cpo&vim -if version >= 600 - setlocal iskeyword=@,48-57,_,-,!,#,$,% -else - set iskeyword=@,48-57,_,-,!,#,$,% -endif +setlocal iskeyword=@,48-57,_,-,!,#,$,% " The Progress editor doesn't cope with tabs very well. set expandtab @@ -282,44 +275,36 @@ syn keyword ProgressType char[acter] int[eger] int64 dec[imal] log[ical] da[te] syn sync lines=800 " 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_progress_syntax_inits") - if version < 508 - let did_progress_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link - " The default methods for highlighting. Can be overridden later. - HiLink ProgressByte Number - HiLink ProgressCase Repeat - HiLink ProgressComment Comment - HiLink ProgressConditional Conditional - HiLink ProgressDebug Debug - HiLink ProgressDo Repeat - HiLink ProgressEndError Error - HiLink ProgressFor Repeat - HiLink ProgressFunction Procedure - HiLink ProgressIdentifier Identifier - HiLink ProgressInclude Include - HiLink ProgressMatrixDelimiter Identifier - HiLink ProgressNumber Number - HiLink ProgressOperator Operator - HiLink ProgressPreProc PreProc - HiLink ProgressProcedure Procedure - HiLink ProgressQuote Delimiter - HiLink ProgressRepeat Repeat - HiLink ProgressReserved Statement - HiLink ProgressSpaceError Error - HiLink ProgressString String - HiLink ProgressTodo Todo - HiLink ProgressType Statement - HiLink ProgressShowTab Error +" The default methods for highlighting. Can be overridden later. +HiLink ProgressByte Number +HiLink ProgressCase Repeat +HiLink ProgressComment Comment +HiLink ProgressConditional Conditional +HiLink ProgressDebug Debug +HiLink ProgressDo Repeat +HiLink ProgressEndError Error +HiLink ProgressFor Repeat +HiLink ProgressFunction Procedure +HiLink ProgressIdentifier Identifier +HiLink ProgressInclude Include +HiLink ProgressMatrixDelimiter Identifier +HiLink ProgressNumber Number +HiLink ProgressOperator Operator +HiLink ProgressPreProc PreProc +HiLink ProgressProcedure Procedure +HiLink ProgressQuote Delimiter +HiLink ProgressRepeat Repeat +HiLink ProgressReserved Statement +HiLink ProgressSpaceError Error +HiLink ProgressString String +HiLink ProgressTodo Todo +HiLink ProgressType Statement +HiLink ProgressShowTab Error - delcommand HiLink -endif +delcommand HiLink let b:current_syntax = "progress" -- 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/progress.vim | 50 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 26 deletions(-) (limited to 'runtime/syntax/progress.vim') diff --git a/runtime/syntax/progress.vim b/runtime/syntax/progress.vim index 9ff506960e..5e7cfef299 100644 --- a/runtime/syntax/progress.vim +++ b/runtime/syntax/progress.vim @@ -276,35 +276,33 @@ syn sync lines=800 " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link " The default methods for highlighting. Can be overridden later. -HiLink ProgressByte Number -HiLink ProgressCase Repeat -HiLink ProgressComment Comment -HiLink ProgressConditional Conditional -HiLink ProgressDebug Debug -HiLink ProgressDo Repeat -HiLink ProgressEndError Error -HiLink ProgressFor Repeat -HiLink ProgressFunction Procedure -HiLink ProgressIdentifier Identifier -HiLink ProgressInclude Include -HiLink ProgressMatrixDelimiter Identifier -HiLink ProgressNumber Number -HiLink ProgressOperator Operator -HiLink ProgressPreProc PreProc -HiLink ProgressProcedure Procedure -HiLink ProgressQuote Delimiter -HiLink ProgressRepeat Repeat -HiLink ProgressReserved Statement -HiLink ProgressSpaceError Error -HiLink ProgressString String -HiLink ProgressTodo Todo -HiLink ProgressType Statement -HiLink ProgressShowTab Error +hi def link ProgressByte Number +hi def link ProgressCase Repeat +hi def link ProgressComment Comment +hi def link ProgressConditional Conditional +hi def link ProgressDebug Debug +hi def link ProgressDo Repeat +hi def link ProgressEndError Error +hi def link ProgressFor Repeat +hi def link ProgressFunction Procedure +hi def link ProgressIdentifier Identifier +hi def link ProgressInclude Include +hi def link ProgressMatrixDelimiter Identifier +hi def link ProgressNumber Number +hi def link ProgressOperator Operator +hi def link ProgressPreProc PreProc +hi def link ProgressProcedure Procedure +hi def link ProgressQuote Delimiter +hi def link ProgressRepeat Repeat +hi def link ProgressReserved Statement +hi def link ProgressSpaceError Error +hi def link ProgressString String +hi def link ProgressTodo Todo +hi def link ProgressType Statement +hi def link ProgressShowTab Error -delcommand HiLink let b:current_syntax = "progress" -- cgit