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/inform.vim | 116 ++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 65 deletions(-) (limited to 'runtime/syntax/inform.vim') diff --git a/runtime/syntax/inform.vim b/runtime/syntax/inform.vim index d8ba43dcee..4d833c7df2 100644 --- a/runtime/syntax/inform.vim +++ b/runtime/syntax/inform.vim @@ -4,10 +4,8 @@ " URL: http://www.gowarthomas.com/informvim " Last Change: 2006 April 20 -" 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 @@ -294,13 +292,8 @@ endif " Handling for different versions of VIM. -if version >= 600 - setlocal iskeyword+=$ - command -nargs=+ SynDisplay syntax display -else - set iskeyword+=$ - command -nargs=+ SynDisplay syntax -endif +setlocal iskeyword+=$ +command -nargs=+ SynDisplay syntax display " Grammar sections. @@ -347,61 +340,54 @@ syn sync maxlines=500 delcommand SynDisplay " The default highlighting. -if version >= 508 || !exists("did_inform_syn_inits") - if version < 508 - let did_inform_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink informDefine Define - HiLink informType Type - HiLink informInclude Include - HiLink informPreCondit PreCondit - HiLink informPreProc PreProc - HiLink informGramPreProc PreProc - HiLink informAsm Special - if !exists("inform_suppress_obsolete") - HiLink informAsmObsolete informError - HiLink informKeywordObsolete informError - else - HiLink informAsmObsolete Special - HiLink informKeywordObsolete Keyword - endif - HiLink informPredicate Operator - HiLink informSysFunc Identifier - HiLink informSysConst Identifier - HiLink informConditional Conditional - HiLink informRepeat Repeat - HiLink informStatement Statement - HiLink informOperator Operator - HiLink informKeyword Keyword - HiLink informGrammar Keyword - HiLink informDictString String - HiLink informNumber Number - HiLink informError Error - HiLink informString String - HiLink informComment Comment - HiLink informAccent Special - HiLink informStringUnicode Special - HiLink informStringCode Special - HiLink informTodo Todo - if !exists("inform_highlight_simple") - HiLink informLibAttrib Identifier - HiLink informLibProp Identifier - HiLink informLibObj Identifier - HiLink informLibRoutine Identifier - HiLink informLibVariable Identifier - HiLink informLibConst Identifier - HiLink informLibAction Identifier - endif - HiLink informBadDictString informError - HiLink informBadAccent informError - HiLink informBadStrUnicode informError - - delcommand HiLink +command -nargs=+ HiLink hi def link + +HiLink informDefine Define +HiLink informType Type +HiLink informInclude Include +HiLink informPreCondit PreCondit +HiLink informPreProc PreProc +HiLink informGramPreProc PreProc +HiLink informAsm Special +if !exists("inform_suppress_obsolete") +HiLink informAsmObsolete informError +HiLink informKeywordObsolete informError +else +HiLink informAsmObsolete Special +HiLink informKeywordObsolete Keyword endif +HiLink informPredicate Operator +HiLink informSysFunc Identifier +HiLink informSysConst Identifier +HiLink informConditional Conditional +HiLink informRepeat Repeat +HiLink informStatement Statement +HiLink informOperator Operator +HiLink informKeyword Keyword +HiLink informGrammar Keyword +HiLink informDictString String +HiLink informNumber Number +HiLink informError Error +HiLink informString String +HiLink informComment Comment +HiLink informAccent Special +HiLink informStringUnicode Special +HiLink informStringCode Special +HiLink informTodo Todo +if !exists("inform_highlight_simple") +HiLink informLibAttrib Identifier +HiLink informLibProp Identifier +HiLink informLibObj Identifier +HiLink informLibRoutine Identifier +HiLink informLibVariable Identifier +HiLink informLibConst Identifier +HiLink informLibAction Identifier +endif +HiLink informBadDictString informError +HiLink informBadAccent informError +HiLink informBadStrUnicode informError + +delcommand HiLink let b:current_syntax = "inform" -- 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/inform.vim | 82 +++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 42 deletions(-) (limited to 'runtime/syntax/inform.vim') diff --git a/runtime/syntax/inform.vim b/runtime/syntax/inform.vim index 4d833c7df2..e3e1b3e1f0 100644 --- a/runtime/syntax/inform.vim +++ b/runtime/syntax/inform.vim @@ -340,54 +340,52 @@ syn sync maxlines=500 delcommand SynDisplay " The default highlighting. -command -nargs=+ HiLink hi def link - -HiLink informDefine Define -HiLink informType Type -HiLink informInclude Include -HiLink informPreCondit PreCondit -HiLink informPreProc PreProc -HiLink informGramPreProc PreProc -HiLink informAsm Special + +hi def link informDefine Define +hi def link informType Type +hi def link informInclude Include +hi def link informPreCondit PreCondit +hi def link informPreProc PreProc +hi def link informGramPreProc PreProc +hi def link informAsm Special if !exists("inform_suppress_obsolete") -HiLink informAsmObsolete informError -HiLink informKeywordObsolete informError +hi def link informAsmObsolete informError +hi def link informKeywordObsolete informError else -HiLink informAsmObsolete Special -HiLink informKeywordObsolete Keyword +hi def link informAsmObsolete Special +hi def link informKeywordObsolete Keyword endif -HiLink informPredicate Operator -HiLink informSysFunc Identifier -HiLink informSysConst Identifier -HiLink informConditional Conditional -HiLink informRepeat Repeat -HiLink informStatement Statement -HiLink informOperator Operator -HiLink informKeyword Keyword -HiLink informGrammar Keyword -HiLink informDictString String -HiLink informNumber Number -HiLink informError Error -HiLink informString String -HiLink informComment Comment -HiLink informAccent Special -HiLink informStringUnicode Special -HiLink informStringCode Special -HiLink informTodo Todo +hi def link informPredicate Operator +hi def link informSysFunc Identifier +hi def link informSysConst Identifier +hi def link informConditional Conditional +hi def link informRepeat Repeat +hi def link informStatement Statement +hi def link informOperator Operator +hi def link informKeyword Keyword +hi def link informGrammar Keyword +hi def link informDictString String +hi def link informNumber Number +hi def link informError Error +hi def link informString String +hi def link informComment Comment +hi def link informAccent Special +hi def link informStringUnicode Special +hi def link informStringCode Special +hi def link informTodo Todo if !exists("inform_highlight_simple") -HiLink informLibAttrib Identifier -HiLink informLibProp Identifier -HiLink informLibObj Identifier -HiLink informLibRoutine Identifier -HiLink informLibVariable Identifier -HiLink informLibConst Identifier -HiLink informLibAction Identifier +hi def link informLibAttrib Identifier +hi def link informLibProp Identifier +hi def link informLibObj Identifier +hi def link informLibRoutine Identifier +hi def link informLibVariable Identifier +hi def link informLibConst Identifier +hi def link informLibAction Identifier endif -HiLink informBadDictString informError -HiLink informBadAccent informError -HiLink informBadStrUnicode informError +hi def link informBadDictString informError +hi def link informBadAccent informError +hi def link informBadStrUnicode informError -delcommand HiLink let b:current_syntax = "inform" -- cgit