aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax/apache.vim
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-05-08 15:43:45 +0300
committerZyX <kp-pav@yandex.ru>2017-05-08 15:43:45 +0300
commit09f849b60000c2d401d82f2b2fb2badde5583658 (patch)
tree662d17ea2e905f4136abef2d003014cb7dc914d4 /runtime/syntax/apache.vim
parent1d7fde39a6927d01de74aefb540ad445bfdfbfda (diff)
parenta9605bb4aff76a934a4c39fbda093ee8fc8a1c71 (diff)
downloadrneovim-09f849b60000c2d401d82f2b2fb2badde5583658.tar.gz
rneovim-09f849b60000c2d401d82f2b2fb2badde5583658.tar.bz2
rneovim-09f849b60000c2d401d82f2b2fb2badde5583658.zip
Merge branch 'master' into luaviml'/lua
Diffstat (limited to 'runtime/syntax/apache.vim')
-rw-r--r--runtime/syntax/apache.vim61
1 files changed, 24 insertions, 37 deletions
diff --git a/runtime/syntax/apache.vim b/runtime/syntax/apache.vim
index 85cda4095a..e2315db0d7 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,28 @@ syn match apacheSection "<\/\=\(<IfVersion\)[^>]*>" 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 <args>
- else
- command -nargs=+ HiLink hi def link <args>
- endif
- 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
-endif
let b:current_syntax = "apache"