updated for version 7.1a

2 files changed, 33 insertions, 12 deletions

diff --git a/runtime/syntax/apache.vim b/runtime/syntax/apache.vim
index d15388a84f..db08ab457f 100644
--- a/runtime/syntax/apache.vim
+++ b/runtime/syntax/apache.vim
@@ -4,9 +4,9 @@
 " Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
 " License: This file can be redistribued and/or modified under the same terms
 "		as Vim itself.
-" Last Change: 2006-04-12
+" Last Change: 2006-12-13
 " URL: http://trific.ath.cx/Ftp/vim/syntax/apache.vim
-" Notes: Last synced with apache-2.2.0, version 1.x is no longer supported
+" 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?
 "		+ add `display' where appropriate
@@ -94,7 +94,7 @@ syn keyword apacheDeclaration AddAlt AddAltByEncoding AddAltByType AddDescriptio
 syn keyword apacheDeclaration IndexStyleSheet
 syn keyword apacheOption DescriptionWidth FancyIndexing FoldersFirst IconHeight IconsAreLinks IconWidth NameWidth ScanHTMLTitles SuppressColumnSorting SuppressDescription SuppressHTMLPreamble SuppressLastModified SuppressSize TrackModified
 syn keyword apacheOption Ascending Descending Name Date Size Description
-syn keyword apacheOption HTMLTable SupressIcon SupressRules VersionSort XHTML
+syn keyword apacheOption HTMLTable SuppressIcon SuppressRules VersionSort XHTML
 syn keyword apacheOption IgnoreClient IgnoreCase ShowForbidden SuppresRules
 syn keyword apacheDeclaration CacheForceCompletion CacheMaxStreamingBuffer
 syn keyword apacheDeclaration CacheDefaultExpire CacheDisable CacheEnable CacheIgnoreCacheControl CacheIgnoreHeaders CacheIgnoreNoLastMod CacheLastModifiedFactor CacheMaxExpire CacheStoreNoStore CacheStorePrivate
@@ -161,7 +161,7 @@ syn keyword apacheDeclaration RewriteBase RewriteCond RewriteEngine RewriteLock
 syn keyword apacheOption inherit
 syn keyword apacheDeclaration BrowserMatch BrowserMatchNoCase SetEnvIf SetEnvIfNoCase
 syn keyword apacheDeclaration LoadFile LoadModule
-syn keyword apacheDeclaration CheckSpelling
+syn keyword apacheDeclaration CheckSpelling CheckCaseOnly
 syn keyword apacheDeclaration SSLCACertificateFile SSLCACertificatePath SSLCADNRequestFile SSLCADNRequestPath SSLCARevocationFile SSLCARevocationPath SSLCertificateChainFile SSLCertificateFile SSLCertificateKeyFile SSLCipherSuite SSLCryptoDevice SSLEngine SSLHonorCipherOrder SSLMutex SSLOptions SSLPassPhraseDialog SSLProtocol SSLProxyCACertificateFile SSLProxyCACertificatePath SSLProxyCARevocationFile SSLProxyCARevocationPath SSLProxyCipherSuite SSLProxyEngine SSLProxyMachineCertificateFile SSLProxyMachineCertificatePath SSLProxyProtocol SSLProxyVerify SSLProxyVerifyDepth SSLRandomSeed SSLRequire SSLRequireSSL SSLSessionCache SSLSessionCacheTimeout SSLUserName SSLVerifyClient SSLVerifyDepth
 syn match apacheOption "[+-]\?\<\(StdEnvVars\|CompatEnvVars\|ExportCertData\|FakeBasicAuth\|StrictRequire\|OptRenegotiate\)\>"
 syn keyword apacheOption builtin sem
diff --git a/runtime/syntax/django.vim b/runtime/syntax/django.vim
index fc48d2608c..d8250d2aea 100644
--- a/runtime/syntax/django.vim
+++ b/runtime/syntax/django.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Django template
 " Maintainer:	Dave Hodder <dmh@dmh.org.uk>
-" Last Change:	2006 Mar 23
+" Last Change:	2007 Jan 26
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -13,9 +13,12 @@ endif
 
 syntax case match
 
+" Mark illegal characters
+syn match djangoError "%}\|}}\|#}"
+
 " Django template built-in tags and parameters
 " 'comment' doesn't appear here because it gets special treatment
-syn keyword djangoStatement contained as block endblock by cycle debug else
+syn keyword djangoStatement contained and as block endblock by cycle debug else
 syn keyword djangoStatement contained extends filter endfilter firstof for
 syn keyword djangoStatement contained endfor if endif ifchanged endifchanged
 syn keyword djangoStatement contained ifequal endifequal ifnotequal
@@ -23,7 +26,11 @@ syn keyword djangoStatement contained endifnotequal in include load not now or
 syn keyword djangoStatement contained parsed regroup reversed spaceless
 syn keyword djangoStatement contained endspaceless ssi templatetag openblock
 syn keyword djangoStatement contained closeblock openvariable closevariable
-syn keyword djangoStatement contained widthratio with
+syn keyword djangoStatement contained openbrace closebrace opencomment
+syn keyword djangoStatement contained closecomment widthratio with
+syn keyword djangoStatement contained get_current_language trans noop blocktrans
+syn keyword djangoStatement contained endblocktrans get_available_languages
+syn keyword djangoStatement contained get_current_language_bidi plural
 
 " Django templete built-in filters
 syn keyword djangoFilter contained add addslashes capfirst center cut date
@@ -34,19 +41,28 @@ syn keyword djangoFilter contained floatformat get_digit join length length_is
 syn keyword djangoFilter contained linebreaks linebreaksbr linenumbers ljust
 syn keyword djangoFilter contained lower make_list phone2numeric pluralize
 syn keyword djangoFilter contained pprint random removetags rjust slice slugify
-syn keyword djangoFilter contained stringformat striptags time timesince title
+syn keyword djangoFilter contained stringformat striptags
+syn keyword djangoFilter contained time timesince timeuntil title
 syn keyword djangoFilter contained truncatewords unordered_list upper urlencode
 syn keyword djangoFilter contained urlize urlizetrunc wordcount wordwrap yesno
 
+" Keywords to highlight within comments
+syn keyword djangoTodo contained TODO FIXME XXX
+
 " Django template constants (always surrounded by double quotes)
 syn region djangoArgument contained start=/"/ skip=/\\"/ end=/"/
 
+" Mark illegal characters within tag and variables blocks
+syn match djangoTagError contained "#}\|{{\|[^%]}}\|[<>!=&#]"
+syn match djangoVarError contained "#}\|{%\|%}\|[<>!=&#%]"
+
 " Django template tag and variable blocks
-syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFilter,djangoArgument display
-syn region djangoVarBlock start="{{" end="}}" contains=djangoFilter,djangoArgument display
+syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFilter,djangoArgument,djangoTagError display
+syn region djangoVarBlock start="{{" end="}}" contains=djangoFilter,djangoArgument,djangoVarError display
 
-" Django template 'comment' tag
-syn region djangoComment start="{%\s*comment\s*%}" end="{%\s*endcomment\s*%}"
+" Django template 'comment' tag and comment block
+syn region djangoComment start="{%\s*comment\s*%}" end="{%\s*endcomment\s*%}" contains=djangoTodo
+syn region djangoComBlock start="{#" end="#}" contains=djangoTodo
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -64,7 +80,12 @@ if version >= 508 || !exists("did_django_syn_inits")
   HiLink djangoStatement Statement
   HiLink djangoFilter Identifier
   HiLink djangoArgument Constant
+  HiLink djangoTagError Error
+  HiLink djangoVarError Error
+  HiLink djangoError Error
   HiLink djangoComment Comment
+  HiLink djangoComBlock Comment
+  HiLink djangoTodo Todo
 
   delcommand HiLink
 endif