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/tcl.vim | 81 ++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 46 deletions(-) (limited to 'runtime/syntax/tcl.vim') diff --git a/runtime/syntax/tcl.vim b/runtime/syntax/tcl.vim index 06629d077f..ff51c140e5 100644 --- a/runtime/syntax/tcl.vim +++ b/runtime/syntax/tcl.vim @@ -10,11 +10,8 @@ " Version: 1.14 " URL: http://bitbucket.org/taylor_venable/metasyntax/src/tip/Config/vim/syntax/tcl.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 @@ -238,49 +235,41 @@ syn region tclComment start=/;\s*\#/hs=s+1 skip="\\$" end="$" contains=tclTodo "syn sync ccomment tclComment " 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_tcl_syntax_inits") - if version < 508 - let did_tcl_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink tcltkSwitch Special - HiLink tclExpand Special - HiLink tclLabel Label - HiLink tclConditional Conditional - HiLink tclRepeat Repeat - HiLink tclNumber Number - HiLink tclError Error - HiLink tclCommand Statement - HiLink tclProcCommand Type - HiLink tclString String - HiLink tclComment Comment - HiLink tclSpecial Special - HiLink tclTodo Todo - " Below here are the commands and their options. - HiLink tcltkCommandColor Statement - HiLink tcltkWidgetColor Structure - HiLink tclLineContinue WarningMsg +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink tcltkSwitch Special +HiLink tclExpand Special +HiLink tclLabel Label +HiLink tclConditional Conditional +HiLink tclRepeat Repeat +HiLink tclNumber Number +HiLink tclError Error +HiLink tclCommand Statement +HiLink tclProcCommand Type +HiLink tclString String +HiLink tclComment Comment +HiLink tclSpecial Special +HiLink tclTodo Todo +" Below here are the commands and their options. +HiLink tcltkCommandColor Statement +HiLink tcltkWidgetColor Structure +HiLink tclLineContinue WarningMsg if exists('g:tcl_warn_continuation') - HiLink tclNotLineContinue ErrorMsg -endif - HiLink tcltkStringSwitch Special - HiLink tcltkArraySwitch Special - HiLink tcltkLsortSwitch Special - HiLink tcltkPackSwitch Special - HiLink tcltkPackConfSwitch Special - HiLink tcltkMaths Special - HiLink tcltkNamespaceSwitch Special - HiLink tcltkWidgetSwitch Special - HiLink tcltkPackConfColor Identifier - HiLink tclVarRef Identifier - - delcommand HiLink +HiLink tclNotLineContinue ErrorMsg endif +HiLink tcltkStringSwitch Special +HiLink tcltkArraySwitch Special +HiLink tcltkLsortSwitch Special +HiLink tcltkPackSwitch Special +HiLink tcltkPackConfSwitch Special +HiLink tcltkMaths Special +HiLink tcltkNamespaceSwitch Special +HiLink tcltkWidgetSwitch Special +HiLink tcltkPackConfColor Identifier +HiLink tclVarRef Identifier + +delcommand HiLink let b:current_syntax = "tcl" -- 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/tcl.vim | 60 ++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 31 deletions(-) (limited to 'runtime/syntax/tcl.vim') diff --git a/runtime/syntax/tcl.vim b/runtime/syntax/tcl.vim index ff51c140e5..64efd6fec4 100644 --- a/runtime/syntax/tcl.vim +++ b/runtime/syntax/tcl.vim @@ -236,40 +236,38 @@ syn region tclComment start=/;\s*\#/hs=s+1 skip="\\$" end="$" contains=tclTodo " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link - -HiLink tcltkSwitch Special -HiLink tclExpand Special -HiLink tclLabel Label -HiLink tclConditional Conditional -HiLink tclRepeat Repeat -HiLink tclNumber Number -HiLink tclError Error -HiLink tclCommand Statement -HiLink tclProcCommand Type -HiLink tclString String -HiLink tclComment Comment -HiLink tclSpecial Special -HiLink tclTodo Todo + +hi def link tcltkSwitch Special +hi def link tclExpand Special +hi def link tclLabel Label +hi def link tclConditional Conditional +hi def link tclRepeat Repeat +hi def link tclNumber Number +hi def link tclError Error +hi def link tclCommand Statement +hi def link tclProcCommand Type +hi def link tclString String +hi def link tclComment Comment +hi def link tclSpecial Special +hi def link tclTodo Todo " Below here are the commands and their options. -HiLink tcltkCommandColor Statement -HiLink tcltkWidgetColor Structure -HiLink tclLineContinue WarningMsg +hi def link tcltkCommandColor Statement +hi def link tcltkWidgetColor Structure +hi def link tclLineContinue WarningMsg if exists('g:tcl_warn_continuation') -HiLink tclNotLineContinue ErrorMsg +hi def link tclNotLineContinue ErrorMsg endif -HiLink tcltkStringSwitch Special -HiLink tcltkArraySwitch Special -HiLink tcltkLsortSwitch Special -HiLink tcltkPackSwitch Special -HiLink tcltkPackConfSwitch Special -HiLink tcltkMaths Special -HiLink tcltkNamespaceSwitch Special -HiLink tcltkWidgetSwitch Special -HiLink tcltkPackConfColor Identifier -HiLink tclVarRef Identifier - -delcommand HiLink +hi def link tcltkStringSwitch Special +hi def link tcltkArraySwitch Special +hi def link tcltkLsortSwitch Special +hi def link tcltkPackSwitch Special +hi def link tcltkPackConfSwitch Special +hi def link tcltkMaths Special +hi def link tcltkNamespaceSwitch Special +hi def link tcltkWidgetSwitch Special +hi def link tcltkPackConfColor Identifier +hi def link tclVarRef Identifier + let b:current_syntax = "tcl" -- cgit