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/cterm.vim | 83 +++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 47 deletions(-) (limited to 'runtime/syntax/cterm.vim') diff --git a/runtime/syntax/cterm.vim b/runtime/syntax/cterm.vim index 139a0d5e17..8510f62cc7 100644 --- a/runtime/syntax/cterm.vim +++ b/runtime/syntax/cterm.vim @@ -4,11 +4,8 @@ " Last Change: 2002 Apr 13 " Version Info: @(#)cterm.vim 1.7 97/12/15 09:23:14 -" 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 @@ -142,48 +139,40 @@ syn match ctermCharacter "'[^\\]'" syn match ctermSpecialCharacter "'\\.'" " 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_cterm_syntax_inits") - if version < 508 - let did_cterm_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink ctermStatement Statement - HiLink ctermFunction Statement - HiLink ctermStrFunction Statement - HiLink ctermIntFunction Statement - HiLink ctermLabel Statement - HiLink ctermConditional Statement - HiLink ctermRepeat Statement - HiLink ctermLibFunc UserDefFunc - HiLink ctermType Type - HiLink ctermFuncArg PreCondit - - HiLink ctermPreVarRO PreCondit - HiLink ctermPreVarRW PreConditBold - HiLink ctermVar Type - - HiLink ctermComment Comment - - HiLink ctermCharacter SpecialChar - HiLink ctermSpecial Special - HiLink ctermSpecialCharacter SpecialChar - HiLink ctermSymbols Special - HiLink ctermString String - HiLink ctermTodo Todo - HiLink ctermOperator Statement - HiLink ctermNumber Number - - " redefine the colors - "hi PreConditBold term=bold ctermfg=1 cterm=bold guifg=Purple gui=bold - "hi Special term=bold ctermfg=6 guifg=SlateBlue gui=underline - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink ctermStatement Statement +HiLink ctermFunction Statement +HiLink ctermStrFunction Statement +HiLink ctermIntFunction Statement +HiLink ctermLabel Statement +HiLink ctermConditional Statement +HiLink ctermRepeat Statement +HiLink ctermLibFunc UserDefFunc +HiLink ctermType Type +HiLink ctermFuncArg PreCondit + +HiLink ctermPreVarRO PreCondit +HiLink ctermPreVarRW PreConditBold +HiLink ctermVar Type + +HiLink ctermComment Comment + +HiLink ctermCharacter SpecialChar +HiLink ctermSpecial Special +HiLink ctermSpecialCharacter SpecialChar +HiLink ctermSymbols Special +HiLink ctermString String +HiLink ctermTodo Todo +HiLink ctermOperator Statement +HiLink ctermNumber Number + +" redefine the colors +"hi PreConditBold term=bold ctermfg=1 cterm=bold guifg=Purple gui=bold +"hi Special term=bold ctermfg=6 guifg=SlateBlue gui=underline + +delcommand HiLink let b:current_syntax = "cterm" -- 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/cterm.vim | 54 +++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'runtime/syntax/cterm.vim') diff --git a/runtime/syntax/cterm.vim b/runtime/syntax/cterm.vim index 8510f62cc7..1b6cb2893f 100644 --- a/runtime/syntax/cterm.vim +++ b/runtime/syntax/cterm.vim @@ -140,39 +140,37 @@ syn match ctermSpecialCharacter "'\\.'" " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link - -HiLink ctermStatement Statement -HiLink ctermFunction Statement -HiLink ctermStrFunction Statement -HiLink ctermIntFunction Statement -HiLink ctermLabel Statement -HiLink ctermConditional Statement -HiLink ctermRepeat Statement -HiLink ctermLibFunc UserDefFunc -HiLink ctermType Type -HiLink ctermFuncArg PreCondit - -HiLink ctermPreVarRO PreCondit -HiLink ctermPreVarRW PreConditBold -HiLink ctermVar Type - -HiLink ctermComment Comment - -HiLink ctermCharacter SpecialChar -HiLink ctermSpecial Special -HiLink ctermSpecialCharacter SpecialChar -HiLink ctermSymbols Special -HiLink ctermString String -HiLink ctermTodo Todo -HiLink ctermOperator Statement -HiLink ctermNumber Number + +hi def link ctermStatement Statement +hi def link ctermFunction Statement +hi def link ctermStrFunction Statement +hi def link ctermIntFunction Statement +hi def link ctermLabel Statement +hi def link ctermConditional Statement +hi def link ctermRepeat Statement +hi def link ctermLibFunc UserDefFunc +hi def link ctermType Type +hi def link ctermFuncArg PreCondit + +hi def link ctermPreVarRO PreCondit +hi def link ctermPreVarRW PreConditBold +hi def link ctermVar Type + +hi def link ctermComment Comment + +hi def link ctermCharacter SpecialChar +hi def link ctermSpecial Special +hi def link ctermSpecialCharacter SpecialChar +hi def link ctermSymbols Special +hi def link ctermString String +hi def link ctermTodo Todo +hi def link ctermOperator Statement +hi def link ctermNumber Number " redefine the colors "hi PreConditBold term=bold ctermfg=1 cterm=bold guifg=Purple gui=bold "hi Special term=bold ctermfg=6 guifg=SlateBlue gui=underline -delcommand HiLink let b:current_syntax = "cterm" -- cgit