summaryrefslogtreecommitdiff
path: root/runtime/syntax/apache.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-09-22 14:42:24 +0200
committerBram Moolenaar <Bram@vim.org>2013-09-22 14:42:24 +0200
commitbaca7f705babaa1caeb0bce7f63f6275feca6641 (patch)
treeab045d9c9d5f5d0287b2b002337f2a41291cd629 /runtime/syntax/apache.vim
parent595cad2ea1c77c40a34a240c71290fdef6aabd3b (diff)
downloadvim-git-baca7f705babaa1caeb0bce7f63f6275feca6641.tar.gz
Update runtime files. Add support for J.
Diffstat (limited to 'runtime/syntax/apache.vim')
-rw-r--r--runtime/syntax/apache.vim11
1 files changed, 6 insertions, 5 deletions
diff --git a/runtime/syntax/apache.vim b/runtime/syntax/apache.vim
index db08ab457..322e43512 100644
--- a/runtime/syntax/apache.vim
+++ b/runtime/syntax/apache.vim
@@ -1,11 +1,9 @@
" Vim syntax file
-" This is a GENERATED FILE. Please always refer to source file at the URI below.
" Language: Apache configuration (httpd.conf, srm.conf, access.conf, .htaccess)
-" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
+" Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
" License: This file can be redistribued and/or modified under the same terms
" as Vim itself.
-" Last Change: 2006-12-13
-" URL: http://trific.ath.cx/Ftp/vim/syntax/apache.vim
+" Last Change: 2013-09-16
" Notes: Last synced with apache-2.2.3, version 1.x is no longer supported
" TODO: see particular FIXME's scattered through the file
" make it really linewise?
@@ -30,7 +28,10 @@ syn keyword apacheFixme FIXME TODO XXX NOT
syn case ignore
syn match apacheAnything "\s[^>]*" contained
syn match apacheError "\w\+" contained
-syn region apacheString start=+"+ end=+"+ skip=+\\\\\|\\\"+
+syn region apacheString start=+"+ end=+"+ skip=+\\\\\|\\\"+ oneline
+
+" Following is to prevent escaped quotes from being parsed as strings.
+syn match apacheSkipQuote +\\"+
" Core and mpm
syn keyword apacheDeclaration AccessFileName AddDefaultCharset AllowOverride AuthName AuthType ContentDigest DefaultType DocumentRoot ErrorDocument ErrorLog HostNameLookups IdentityCheck Include KeepAlive KeepAliveTimeout LimitRequestBody LimitRequestFields LimitRequestFieldsize LimitRequestLine LogLevel MaxKeepAliveRequests NameVirtualHost Options Require RLimitCPU RLimitMEM RLimitNPROC Satisfy ScriptInterpreterSource ServerAdmin ServerAlias ServerName ServerPath ServerRoot ServerSignature ServerTokens TimeOut UseCanonicalName