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/icon.vim | 99 ++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 55 deletions(-) (limited to 'runtime/syntax/icon.vim') diff --git a/runtime/syntax/icon.vim b/runtime/syntax/icon.vim index 1a73c43d8f..1bd12d3220 100644 --- a/runtime/syntax/icon.vim +++ b/runtime/syntax/icon.vim @@ -4,11 +4,8 @@ " URL: ftp://ftp.halcyon.com/pub/users/wturner/icon.vim " Last Change: 2003 May 11 -" 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 @@ -157,56 +154,48 @@ exec "syn sync ccomment iconComment minlines=" . icon_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 -if version >= 508 || !exists("did_icon_syn_inits") - if version < 508 - let did_icon_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - " The default methods for highlighting. Can be overridden later - - " HiLink iconSpecialCharacter iconSpecial - - HiLink iconOctalError iconError - HiLink iconParenError iconError - HiLink iconInParen iconError - HiLink iconCommentError iconError - HiLink iconSpaceError iconError - HiLink iconCommentError iconError - HiLink iconIncluded iconString - HiLink iconCommentString iconString - HiLink iconComment2String iconString - HiLink iconCommentSkip iconComment - - HiLink iconUserLabel Label - HiLink iconCharacter Character - HiLink iconNumber Number - HiLink iconRadix Number - HiLink iconFloat Float - HiLink iconInclude Include - HiLink iconPreProc PreProc - HiLink iconDefine Macro - HiLink iconError Error - HiLink iconStatement Statement - HiLink iconPreCondit PreCondit - HiLink iconString String - HiLink iconCset String - HiLink iconComment Comment - HiLink iconSpecial SpecialChar - HiLink iconTodo Todo - HiLink iconStorageClass StorageClass - HiLink iconFunction Statement - HiLink iconReserved Label - HiLink iconKeyword Operator - - "HiLink iconIdentifier Identifier - - delcommand HiLink -endif +" Only when an item doesn't have highlighting +command -nargs=+ HiLink hi def link + +" The default methods for highlighting. Can be overridden later + +" HiLink iconSpecialCharacter iconSpecial + +HiLink iconOctalError iconError +HiLink iconParenError iconError +HiLink iconInParen iconError +HiLink iconCommentError iconError +HiLink iconSpaceError iconError +HiLink iconCommentError iconError +HiLink iconIncluded iconString +HiLink iconCommentString iconString +HiLink iconComment2String iconString +HiLink iconCommentSkip iconComment + +HiLink iconUserLabel Label +HiLink iconCharacter Character +HiLink iconNumber Number +HiLink iconRadix Number +HiLink iconFloat Float +HiLink iconInclude Include +HiLink iconPreProc PreProc +HiLink iconDefine Macro +HiLink iconError Error +HiLink iconStatement Statement +HiLink iconPreCondit PreCondit +HiLink iconString String +HiLink iconCset String +HiLink iconComment Comment +HiLink iconSpecial SpecialChar +HiLink iconTodo Todo +HiLink iconStorageClass StorageClass +HiLink iconFunction Statement +HiLink iconReserved Label +HiLink iconKeyword Operator + +"HiLink iconIdentifier Identifier + +delcommand HiLink let b:current_syntax = "icon" -- 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/icon.vim | 74 ++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 38 deletions(-) (limited to 'runtime/syntax/icon.vim') diff --git a/runtime/syntax/icon.vim b/runtime/syntax/icon.vim index 1bd12d3220..179d75cd28 100644 --- a/runtime/syntax/icon.vim +++ b/runtime/syntax/icon.vim @@ -155,47 +155,45 @@ exec "syn sync ccomment iconComment minlines=" . icon_minlines " Define the default highlighting. " Only when an item doesn't have highlighting -command -nargs=+ HiLink hi def link " The default methods for highlighting. Can be overridden later -" HiLink iconSpecialCharacter iconSpecial - -HiLink iconOctalError iconError -HiLink iconParenError iconError -HiLink iconInParen iconError -HiLink iconCommentError iconError -HiLink iconSpaceError iconError -HiLink iconCommentError iconError -HiLink iconIncluded iconString -HiLink iconCommentString iconString -HiLink iconComment2String iconString -HiLink iconCommentSkip iconComment - -HiLink iconUserLabel Label -HiLink iconCharacter Character -HiLink iconNumber Number -HiLink iconRadix Number -HiLink iconFloat Float -HiLink iconInclude Include -HiLink iconPreProc PreProc -HiLink iconDefine Macro -HiLink iconError Error -HiLink iconStatement Statement -HiLink iconPreCondit PreCondit -HiLink iconString String -HiLink iconCset String -HiLink iconComment Comment -HiLink iconSpecial SpecialChar -HiLink iconTodo Todo -HiLink iconStorageClass StorageClass -HiLink iconFunction Statement -HiLink iconReserved Label -HiLink iconKeyword Operator - -"HiLink iconIdentifier Identifier - -delcommand HiLink +" hi def link iconSpecialCharacter iconSpecial + +hi def link iconOctalError iconError +hi def link iconParenError iconError +hi def link iconInParen iconError +hi def link iconCommentError iconError +hi def link iconSpaceError iconError +hi def link iconCommentError iconError +hi def link iconIncluded iconString +hi def link iconCommentString iconString +hi def link iconComment2String iconString +hi def link iconCommentSkip iconComment + +hi def link iconUserLabel Label +hi def link iconCharacter Character +hi def link iconNumber Number +hi def link iconRadix Number +hi def link iconFloat Float +hi def link iconInclude Include +hi def link iconPreProc PreProc +hi def link iconDefine Macro +hi def link iconError Error +hi def link iconStatement Statement +hi def link iconPreCondit PreCondit +hi def link iconString String +hi def link iconCset String +hi def link iconComment Comment +hi def link iconSpecial SpecialChar +hi def link iconTodo Todo +hi def link iconStorageClass StorageClass +hi def link iconFunction Statement +hi def link iconReserved Label +hi def link iconKeyword Operator + +"hi def link iconIdentifier Identifier + let b:current_syntax = "icon" -- cgit