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/rc.vim | 97 +++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 54 deletions(-) (limited to 'runtime/syntax/rc.vim') diff --git a/runtime/syntax/rc.vim b/runtime/syntax/rc.vim index a2d5824d3e..13900b339a 100644 --- a/runtime/syntax/rc.vim +++ b/runtime/syntax/rc.vim @@ -8,11 +8,8 @@ " This file is based on the c.vim -" 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 @@ -148,55 +145,47 @@ syn region rcPreProc start="^\s*#\s*\(pragma\>\|line\>\|warning\>\|warn\>\|erro syn sync ccomment rcComment minlines=10 " 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_rc_syntax_inits") - if version < 508 - let did_rc_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink rcCharacter Character - HiLink rcSpecialCharacter rcSpecial - HiLink rcNumber Number - HiLink rcFloat Float - HiLink rcOctalError rcError - HiLink rcParenError rcError - HiLink rcInParen rcError - HiLink rcCommentError rcError - HiLink rcInclude Include - HiLink rcPreProc PreProc - HiLink rcDefine Macro - HiLink rcIncluded rcString - HiLink rcError Error - HiLink rcPreCondit PreCondit - HiLink rcCommentString rcString - HiLink rcComment2String rcString - HiLink rcCommentSkip rcComment - HiLink rcString String - HiLink rcComment Comment - HiLink rcSpecial SpecialChar - HiLink rcTodo Todo - - HiLink rcAttribute rcCommonAttribute - HiLink rcStdId rcStatement - HiLink rcStatement Statement - - " Default color overrides - hi def rcLanguage term=reverse ctermbg=Red ctermfg=Yellow guibg=Red guifg=Yellow - hi def rcMainObject term=underline ctermfg=Blue guifg=Blue - hi def rcSubObject ctermfg=Green guifg=Green - hi def rcCaptionParam term=underline ctermfg=DarkGreen guifg=Green - hi def rcParam ctermfg=DarkGreen guifg=DarkGreen - hi def rcStatement ctermfg=DarkGreen guifg=DarkGreen - hi def rcCommonAttribute ctermfg=Brown guifg=Brown - - "HiLink rcIdentifier Identifier - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink rcCharacter Character +HiLink rcSpecialCharacter rcSpecial +HiLink rcNumber Number +HiLink rcFloat Float +HiLink rcOctalError rcError +HiLink rcParenError rcError +HiLink rcInParen rcError +HiLink rcCommentError rcError +HiLink rcInclude Include +HiLink rcPreProc PreProc +HiLink rcDefine Macro +HiLink rcIncluded rcString +HiLink rcError Error +HiLink rcPreCondit PreCondit +HiLink rcCommentString rcString +HiLink rcComment2String rcString +HiLink rcCommentSkip rcComment +HiLink rcString String +HiLink rcComment Comment +HiLink rcSpecial SpecialChar +HiLink rcTodo Todo + +HiLink rcAttribute rcCommonAttribute +HiLink rcStdId rcStatement +HiLink rcStatement Statement + +" Default color overrides +hi def rcLanguage term=reverse ctermbg=Red ctermfg=Yellow guibg=Red guifg=Yellow +hi def rcMainObject term=underline ctermfg=Blue guifg=Blue +hi def rcSubObject ctermfg=Green guifg=Green +hi def rcCaptionParam term=underline ctermfg=DarkGreen guifg=Green +hi def rcParam ctermfg=DarkGreen guifg=DarkGreen +hi def rcStatement ctermfg=DarkGreen guifg=DarkGreen +hi def rcCommonAttribute ctermfg=Brown guifg=Brown + +"HiLink rcIdentifier Identifier + +delcommand HiLink let b:current_syntax = "rc" -- 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/rc.vim | 56 +++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 29 deletions(-) (limited to 'runtime/syntax/rc.vim') diff --git a/runtime/syntax/rc.vim b/runtime/syntax/rc.vim index 13900b339a..4c6856bc83 100644 --- a/runtime/syntax/rc.vim +++ b/runtime/syntax/rc.vim @@ -146,33 +146,32 @@ syn sync ccomment rcComment minlines=10 " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link - -HiLink rcCharacter Character -HiLink rcSpecialCharacter rcSpecial -HiLink rcNumber Number -HiLink rcFloat Float -HiLink rcOctalError rcError -HiLink rcParenError rcError -HiLink rcInParen rcError -HiLink rcCommentError rcError -HiLink rcInclude Include -HiLink rcPreProc PreProc -HiLink rcDefine Macro -HiLink rcIncluded rcString -HiLink rcError Error -HiLink rcPreCondit PreCondit -HiLink rcCommentString rcString -HiLink rcComment2String rcString -HiLink rcCommentSkip rcComment -HiLink rcString String -HiLink rcComment Comment -HiLink rcSpecial SpecialChar -HiLink rcTodo Todo - -HiLink rcAttribute rcCommonAttribute -HiLink rcStdId rcStatement -HiLink rcStatement Statement + +hi def link rcCharacter Character +hi def link rcSpecialCharacter rcSpecial +hi def link rcNumber Number +hi def link rcFloat Float +hi def link rcOctalError rcError +hi def link rcParenError rcError +hi def link rcInParen rcError +hi def link rcCommentError rcError +hi def link rcInclude Include +hi def link rcPreProc PreProc +hi def link rcDefine Macro +hi def link rcIncluded rcString +hi def link rcError Error +hi def link rcPreCondit PreCondit +hi def link rcCommentString rcString +hi def link rcComment2String rcString +hi def link rcCommentSkip rcComment +hi def link rcString String +hi def link rcComment Comment +hi def link rcSpecial SpecialChar +hi def link rcTodo Todo + +hi def link rcAttribute rcCommonAttribute +hi def link rcStdId rcStatement +hi def link rcStatement Statement " Default color overrides hi def rcLanguage term=reverse ctermbg=Red ctermfg=Yellow guibg=Red guifg=Yellow @@ -183,9 +182,8 @@ hi def rcParam ctermfg=DarkGreen guifg=DarkGreen hi def rcStatement ctermfg=DarkGreen guifg=DarkGreen hi def rcCommonAttribute ctermfg=Brown guifg=Brown -"HiLink rcIdentifier Identifier +"hi def link rcIdentifier Identifier -delcommand HiLink let b:current_syntax = "rc" -- cgit