From baca7f705babaa1caeb0bce7f63f6275feca6641 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 22 Sep 2013 14:42:24 +0200 Subject: Update runtime files. Add support for J. --- runtime/syntax/apache.vim | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'runtime/syntax/apache.vim') 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) +" Maintainer: David Necas (Yeti) " 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 -- cgit v1.2.1