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/apache.vim | 63 +++++++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 37 deletions(-) (limited to 'runtime/syntax/apache.vim') diff --git a/runtime/syntax/apache.vim b/runtime/syntax/apache.vim index 85cda4095a..b556fa350d 100644 --- a/runtime/syntax/apache.vim +++ b/runtime/syntax/apache.vim @@ -9,13 +9,9 @@ " make it really linewise? " + add `display' where appropriate -" Setup -if version >= 600 - if exists("b:current_syntax") - finish - endif -else - syntax clear +" quit when a syntax file was already loaded +if exists("b:current_syntax") + finish endif syn case ignore @@ -178,37 +174,30 @@ syn match apacheSection "<\/\=\(]*>" contains=apacheAnything syn keyword apacheDeclaration VirtualDocumentRoot VirtualDocumentRootIP VirtualScriptAlias VirtualScriptAliasIP " Define the default highlighting -if version >= 508 || !exists("did_apache_syntax_inits") - if version < 508 - let did_apache_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif +command -nargs=+ HiLink hi def link - HiLink apacheAllowOverride apacheDeclaration - HiLink apacheAllowOverrideValue apacheOption - HiLink apacheAuthType apacheDeclaration - HiLink apacheAuthTypeValue apacheOption - HiLink apacheOptionOption apacheOption - HiLink apacheDeclaration Function - HiLink apacheAnything apacheOption - HiLink apacheOption Number - HiLink apacheComment Comment - HiLink apacheFixme Todo - HiLink apacheLimitSectionKeyword apacheLimitSection - HiLink apacheLimitSection apacheSection - HiLink apacheSection Label - HiLink apacheMethodOption Type - HiLink apacheAllowDeny Include - HiLink apacheAllowDenyValue Identifier - HiLink apacheOrder Special - HiLink apacheOrderValue String - HiLink apacheString String - HiLink apacheError Error - HiLink apacheUserID Number +HiLink apacheAllowOverride apacheDeclaration +HiLink apacheAllowOverrideValue apacheOption +HiLink apacheAuthType apacheDeclaration +HiLink apacheAuthTypeValue apacheOption +HiLink apacheOptionOption apacheOption +HiLink apacheDeclaration Function +HiLink apacheAnything apacheOption +HiLink apacheOption Number +HiLink apacheComment Comment +HiLink apacheFixme Todo +HiLink apacheLimitSectionKeyword apacheLimitSection +HiLink apacheLimitSection apacheSection +HiLink apacheSection Label +HiLink apacheMethodOption Type +HiLink apacheAllowDeny Include +HiLink apacheAllowDenyValue Identifier +HiLink apacheOrder Special +HiLink apacheOrderValue String +HiLink apacheString String +HiLink apacheError Error +HiLink apacheUserID Number - delcommand HiLink -endif +delcommand HiLink let b:current_syntax = "apache" -- 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/apache.vim | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'runtime/syntax/apache.vim') diff --git a/runtime/syntax/apache.vim b/runtime/syntax/apache.vim index b556fa350d..e2315db0d7 100644 --- a/runtime/syntax/apache.vim +++ b/runtime/syntax/apache.vim @@ -174,30 +174,28 @@ syn match apacheSection "<\/\=\(]*>" contains=apacheAnything syn keyword apacheDeclaration VirtualDocumentRoot VirtualDocumentRootIP VirtualScriptAlias VirtualScriptAliasIP " Define the default highlighting -command -nargs=+ HiLink hi def link -HiLink apacheAllowOverride apacheDeclaration -HiLink apacheAllowOverrideValue apacheOption -HiLink apacheAuthType apacheDeclaration -HiLink apacheAuthTypeValue apacheOption -HiLink apacheOptionOption apacheOption -HiLink apacheDeclaration Function -HiLink apacheAnything apacheOption -HiLink apacheOption Number -HiLink apacheComment Comment -HiLink apacheFixme Todo -HiLink apacheLimitSectionKeyword apacheLimitSection -HiLink apacheLimitSection apacheSection -HiLink apacheSection Label -HiLink apacheMethodOption Type -HiLink apacheAllowDeny Include -HiLink apacheAllowDenyValue Identifier -HiLink apacheOrder Special -HiLink apacheOrderValue String -HiLink apacheString String -HiLink apacheError Error -HiLink apacheUserID Number +hi def link apacheAllowOverride apacheDeclaration +hi def link apacheAllowOverrideValue apacheOption +hi def link apacheAuthType apacheDeclaration +hi def link apacheAuthTypeValue apacheOption +hi def link apacheOptionOption apacheOption +hi def link apacheDeclaration Function +hi def link apacheAnything apacheOption +hi def link apacheOption Number +hi def link apacheComment Comment +hi def link apacheFixme Todo +hi def link apacheLimitSectionKeyword apacheLimitSection +hi def link apacheLimitSection apacheSection +hi def link apacheSection Label +hi def link apacheMethodOption Type +hi def link apacheAllowDeny Include +hi def link apacheAllowDenyValue Identifier +hi def link apacheOrder Special +hi def link apacheOrderValue String +hi def link apacheString String +hi def link apacheError Error +hi def link apacheUserID Number -delcommand HiLink let b:current_syntax = "apache" -- cgit