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/uc.vim | 115 +++++++++++++++++++++++--------------------------- 1 file changed, 52 insertions(+), 63 deletions(-) (limited to 'runtime/syntax/uc.vim') diff --git a/runtime/syntax/uc.vim b/runtime/syntax/uc.vim index 7eab1d48ae..e128cbf82c 100644 --- a/runtime/syntax/uc.vim +++ b/runtime/syntax/uc.vim @@ -7,11 +7,8 @@ " Please check :help uc.vim for comments on some of the options available. -" 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 @@ -110,64 +107,56 @@ endif exec "syn sync ccomment ucComment minlines=" . uc_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 yet -if version >= 508 || !exists("did_uc_syntax_inits") - if version < 508 - let did_uc_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink ucFuncDef Conditional - HiLink ucEventDef Conditional - HiLink ucBraces Function - HiLink ucBranch Conditional - HiLink ucLabel Label - HiLink ucUserLabel Label - HiLink ucConditional Conditional - HiLink ucRepeat Repeat - HiLink ucStorageClass StorageClass - HiLink ucMethodDecl ucStorageClass - HiLink ucClassDecl ucStorageClass - HiLink ucScopeDecl ucStorageClass - HiLink ucBoolean Boolean - HiLink ucSpecial Special - HiLink ucSpecialError Error - HiLink ucSpecialCharError Error - HiLink ucString String - HiLink ucCharacter Character - HiLink ucSpecialChar SpecialChar - HiLink ucNumber Number - HiLink ucError Error - HiLink ucStringError Error - HiLink ucStatement Statement - HiLink ucOperator Operator - HiLink ucOverLoaded Operator - HiLink ucComment Comment - HiLink ucDocComment Comment - HiLink ucLineComment Comment - HiLink ucConstant ucBoolean - HiLink ucTypedef Typedef - HiLink ucTodo Todo - - HiLink ucCommentTitle SpecialComment - HiLink ucDocTags Special - HiLink ucDocParam Function - HiLink ucCommentStar ucComment - - HiLink ucType Type - HiLink ucExternal Include - - HiLink ucClassKeys Conditional - HiLink ucClassLabel Conditional - - HiLink htmlComment Special - HiLink htmlCommentPart Special - - delcommand HiLink -endif +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink ucFuncDef Conditional +HiLink ucEventDef Conditional +HiLink ucBraces Function +HiLink ucBranch Conditional +HiLink ucLabel Label +HiLink ucUserLabel Label +HiLink ucConditional Conditional +HiLink ucRepeat Repeat +HiLink ucStorageClass StorageClass +HiLink ucMethodDecl ucStorageClass +HiLink ucClassDecl ucStorageClass +HiLink ucScopeDecl ucStorageClass +HiLink ucBoolean Boolean +HiLink ucSpecial Special +HiLink ucSpecialError Error +HiLink ucSpecialCharError Error +HiLink ucString String +HiLink ucCharacter Character +HiLink ucSpecialChar SpecialChar +HiLink ucNumber Number +HiLink ucError Error +HiLink ucStringError Error +HiLink ucStatement Statement +HiLink ucOperator Operator +HiLink ucOverLoaded Operator +HiLink ucComment Comment +HiLink ucDocComment Comment +HiLink ucLineComment Comment +HiLink ucConstant ucBoolean +HiLink ucTypedef Typedef +HiLink ucTodo Todo + +HiLink ucCommentTitle SpecialComment +HiLink ucDocTags Special +HiLink ucDocParam Function +HiLink ucCommentStar ucComment + +HiLink ucType Type +HiLink ucExternal Include + +HiLink ucClassKeys Conditional +HiLink ucClassLabel Conditional + +HiLink htmlComment Special +HiLink htmlCommentPart Special + +delcommand HiLink let b:current_syntax = "uc" -- 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/uc.vim | 96 +++++++++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 49 deletions(-) (limited to 'runtime/syntax/uc.vim') diff --git a/runtime/syntax/uc.vim b/runtime/syntax/uc.vim index e128cbf82c..90d33396c5 100644 --- a/runtime/syntax/uc.vim +++ b/runtime/syntax/uc.vim @@ -108,55 +108,53 @@ exec "syn sync ccomment ucComment minlines=" . uc_minlines " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link - -HiLink ucFuncDef Conditional -HiLink ucEventDef Conditional -HiLink ucBraces Function -HiLink ucBranch Conditional -HiLink ucLabel Label -HiLink ucUserLabel Label -HiLink ucConditional Conditional -HiLink ucRepeat Repeat -HiLink ucStorageClass StorageClass -HiLink ucMethodDecl ucStorageClass -HiLink ucClassDecl ucStorageClass -HiLink ucScopeDecl ucStorageClass -HiLink ucBoolean Boolean -HiLink ucSpecial Special -HiLink ucSpecialError Error -HiLink ucSpecialCharError Error -HiLink ucString String -HiLink ucCharacter Character -HiLink ucSpecialChar SpecialChar -HiLink ucNumber Number -HiLink ucError Error -HiLink ucStringError Error -HiLink ucStatement Statement -HiLink ucOperator Operator -HiLink ucOverLoaded Operator -HiLink ucComment Comment -HiLink ucDocComment Comment -HiLink ucLineComment Comment -HiLink ucConstant ucBoolean -HiLink ucTypedef Typedef -HiLink ucTodo Todo - -HiLink ucCommentTitle SpecialComment -HiLink ucDocTags Special -HiLink ucDocParam Function -HiLink ucCommentStar ucComment - -HiLink ucType Type -HiLink ucExternal Include - -HiLink ucClassKeys Conditional -HiLink ucClassLabel Conditional - -HiLink htmlComment Special -HiLink htmlCommentPart Special - -delcommand HiLink + +hi def link ucFuncDef Conditional +hi def link ucEventDef Conditional +hi def link ucBraces Function +hi def link ucBranch Conditional +hi def link ucLabel Label +hi def link ucUserLabel Label +hi def link ucConditional Conditional +hi def link ucRepeat Repeat +hi def link ucStorageClass StorageClass +hi def link ucMethodDecl ucStorageClass +hi def link ucClassDecl ucStorageClass +hi def link ucScopeDecl ucStorageClass +hi def link ucBoolean Boolean +hi def link ucSpecial Special +hi def link ucSpecialError Error +hi def link ucSpecialCharError Error +hi def link ucString String +hi def link ucCharacter Character +hi def link ucSpecialChar SpecialChar +hi def link ucNumber Number +hi def link ucError Error +hi def link ucStringError Error +hi def link ucStatement Statement +hi def link ucOperator Operator +hi def link ucOverLoaded Operator +hi def link ucComment Comment +hi def link ucDocComment Comment +hi def link ucLineComment Comment +hi def link ucConstant ucBoolean +hi def link ucTypedef Typedef +hi def link ucTodo Todo + +hi def link ucCommentTitle SpecialComment +hi def link ucDocTags Special +hi def link ucDocParam Function +hi def link ucCommentStar ucComment + +hi def link ucType Type +hi def link ucExternal Include + +hi def link ucClassKeys Conditional +hi def link ucClassLabel Conditional + +hi def link htmlComment Special +hi def link htmlCommentPart Special + let b:current_syntax = "uc" -- cgit