updated for version 7.0140v7.0140

1 files changed, 130 insertions, 106 deletions

diff --git a/runtime/syntax/cf.vim b/runtime/syntax/cf.vim
index 6cf111d996..647c56a8c6 100644
--- a/runtime/syntax/cf.vim
+++ b/runtime/syntax/cf.vim
@@ -1,11 +1,12 @@
 " Vim syntax file
-"    Language: Cold Fusion
-"  Maintainer: Jeff Lanzarotta (jefflanzarotta@yahoo.com)
-"	  URL: http://lanzarotta.tripod.com/vim/syntax/cf.vim.zip
-" Last Change: October 15, 2001
-"	Usage: Since Cold Fusion has its own version of html comments,
-"	       make sure that you put
-"	       'let html_wrong_comments=1' in your _vimrc file.
+"    Language: ColdFusion
+"  Maintainer: Toby Woodwark (toby.woodwark+vim@gmail.com)
+" Last Change: August 3, 2005
+" 	ColdFusion MX 7
+"	Usage: Since ColdFusion has its own version of HTML comments 
+"	(<!--- --->)
+"       make sure that you put 'let html_wrong_comments=1' in your .vimrc /
+"       _vimrc file.
 
 " For version 5.x, clear all syntax items.
 " For version 6.x, quit when a syntax file was already loaded.
@@ -15,7 +16,7 @@ elseif exists("b:current_syntax")
   finish
 endif
 
-" Use all the stuff from the original html syntax file.
+" Use all the stuff from the HTML syntax file.
 if version < 600
   source <sfile>:p:h/html.vim
 else
@@ -23,105 +24,127 @@ else
 endif
 
 " Tag names.
-syn keyword cfTagName contained cfabort cfapplet cfapplication cfassociate
-syn keyword cfTagName contained cfauthenticate cfbreak cfcache cfcol
-syn keyword cfTagName contained cfcollection cfcontent cfcookie cfdirectory
-syn keyword cfTagName contained cferror cfexit cffile cfform cfftp cfgrid
-syn keyword cfTagName contained cfgridcolumn cfgridrow cfgridupdate cfheader
-syn keyword cfTagName contained cfhtmlhead cfhttp cfhttpparam
-syn keyword cfTagName contained cfif cfelseif cfelse
-syn keyword cfTagName contained cfinclude cfindex cfinput cfinsert
-syn keyword cfTagName contained cfldap cflocation cflock cfloop cfmail
-syn keyword cfTagName contained cfmodule cfobject cfoutput cfparam cfpop
-syn keyword cfTagName contained cfprocparam cfprocresult cfquery cfregistry
-syn keyword cfTagName contained cfreport cfschedule cfscript cfsearch cfselect
-syn keyword cfTagName contained cfset cfsetting cfslider cfstoredproc
-syn keyword cfTagName contained cfswitch cfcase cfdefaultcase
-syn keyword cfTagName contained cftable cftextinput cfthrow cftransaction
-syn keyword cfTagName contained cftree cftreeitem
-syn keyword cfTagName contained cftry cfcatch
-syn keyword cfTagName contained cfupdate cfwddx
+syn keyword cfTagName contained cfabort cfapplet cfapplication cfargument cfassociate cfbreak cfcache
+syn keyword cfTagName contained cfcalendar cfcase cfcatch cfchart cfchartdata cfchartseries cfcol cfcollection
+syn keyword cfTagName contained cfcomponent cfcontent cfcookie cfdefaultcase cfdirectory cfdocument
+syn keyword cfTagName contained cfdocumentitem cfdocumentsection cfdump cfelse cfelseif cferror cfexecute
+syn keyword cfTagName contained cfexit cffile cfflush cfform cfformgroup cfformitem cfftp cffunction cfgrid
+syn keyword cfTagName contained cfgridcolumn cfgridrow cfgridupdate cfheader cfhtmlhead cfhttp cfhttpparam cfif
+syn keyword cfTagName contained cfimport cfinclude cfindex cfinput cfinsert cfinvoke cfinvokeargument
+syn keyword cfTagName contained cfldap cflocation cflock cflog cflogin cfloginuser cflogout cfloop cfmail
+syn keyword cfTagName contained cfmailparam cfmailpart cfmodule cfNTauthenticate cfobject cfobjectcache
+syn keyword cfTagName contained cfoutput cfparam cfpop cfprocessingdirective cfprocparam cfprocresult
+syn keyword cfTagName contained cfproperty cfquery cfqueryparam cfregistry cfreport cfreportparam cfrethrow
+syn keyword cfTagName contained cfreturn cfsavecontent cfschedule cfscript cfsearch cfselect cfset cfsetting
+syn keyword cfTagName contained cfsilent cfslider cfstoredproc cfswitch cftable cftextarea cfthrow cftimer
+syn keyword cfTagName contained cftrace cftransaction cftree cftreeitem cftry cfupdate cfwddx cfxml 
 
-" Legal arguments.
-syn keyword cfArg contained accept action addnewline addtoken agentname align
-syn keyword cfArg contained appendkey applicationtimeout attachmentpath
-syn keyword cfArg contained attributecollection attributes basetag bgcolor
-syn keyword cfArg contained blockfactor body bold border branch cachedafter
-syn keyword cfArg contained cachedwithin cc cfsqltype checked class clientmanagement
-syn keyword cfArg contained clientstorage colheaderalign colheaderbold colheaderfont
-syn keyword cfArg contained colheaderfontsize colheaderitalic colheaders collection
-syn keyword cfArg contained colspacing columns completepath connection context
-syn keyword cfArg contained criteria custom1 custom2 data dataalign datacollection
-syn keyword cfArg contained datasource dbname dbserver dbtype dbvarname debug default
-syn keyword cfArg contained delete deletebutton deletefile delimiter destination detail
-syn keyword cfArg contained directory display dn domain enablecab enablecfoutputonly
-syn keyword cfArg contained enctype enddate endtime entry errorcode expand expires
-syn keyword cfArg contained expireurl expression extendedinfo extensions external
-syn keyword cfArg contained file filefield filter font fontsize formfields formula
-syn keyword cfArg contained from grid griddataalign gridlines groovecolor group header
-syn keyword cfArg contained headeralign headerbold headerfont headerfontsize headeritalic
-syn keyword cfArg contained headerlines height highlighthref href hrefkey hscroll hspace
-syn keyword cfArg contained htmltable img imgopen imgstyle index input insert insertbutton
-syn keyword cfArg contained interval isolation italic key keyonly label language mailerid
-syn keyword cfArg contained mailto maxlength maxrows message messagenumber method
-syn keyword cfArg contained mimeattach mode multiple name namecomplict newdirectory
-syn keyword cfArg contained notsupported null numberformat onerror onsubmit onvalidate
-syn keyword cfArg contained operation orderby output parrent passthrough password path
-syn keyword cfArg contained picturebar port procedure protocol provider providerdsn
-syn keyword cfArg contained proxybypass proxyserver publish query queryasroot range
-syn keyword cfArg contained recurse refreshlabel report requesttimeout required reset
-syn keyword cfArg contained resoleurl resultset retrycount returncode rowheaderalign
-syn keyword cfArg contained rowheaderbold rowheaderfont rowheaderfontsize rowheaderitalic
-syn keyword cfArg contained rowheaders rowheaderwidth rowheight scale scope secure
-syn keyword cfArg contained securitycontext select selectcolor selected selectmode server
-syn keyword cfArg contained sessionmanagement sessiontimeout setclientcookies setcookie
-syn keyword cfArg contained showdebugoutput showerror size sort sortascendingbutton
-syn keyword cfArg contained sortdescendingbutton source sql start startdate startrow starttime
-syn keyword cfArg contained step stoponerror subject tablename tableowner tablequalifier
-syn keyword cfArg contained target task template text textcolor textqualifier
-syn keyword cfArg contained throwonfailure throwontimeout timeout title to toplevelvariable
-syn keyword cfArg contained type url urlpath username usetimezoneinfo validate value
-syn keyword cfArg contained variable vscroll vspace width
+" Tag parameters.
+syn keyword cfArg contained abort accept access accessible action addnewline addtoken addtoken agentname
+syn keyword cfArg contained align appendkey appletsource application applicationtimeout applicationtoken
+syn keyword cfArg contained archive argumentcollection arguments asciiextensionlist attachmentpath
+syn keyword cfArg contained attributecollection attributes attributes autowidth backgroundcolor
+syn keyword cfArg contained backgroundvisible basetag bcc bgcolor bind bindingname blockfactor body bold
+syn keyword cfArg contained border branch cachedafter cachedwithin casesensitive categories category
+syn keyword cfArg contained categorytree cc cfsqltype charset chartheight chartwidth checked class
+syn keyword cfArg contained clientmanagement clientstorage codebase colheaderalign colheaderbold
+syn keyword cfArg contained colheaderfont colheaderfontsize colheaderitalic colheaders colheadertextcolor
+syn keyword cfArg contained collection colorlist colspacing columns completepath component condition
+syn keyword cfArg contained connection contentid context contextbytes contexthighlightbegin
+syn keyword cfArg contained contexthighlightend contextpassages cookiedomain criteria custom1 custom2
+syn keyword cfArg contained custom3 custom4 data dataalign databackgroundcolor datacollection
+syn keyword cfArg contained datalabelstyle datasource date daynames dbname dbserver dbtype dbvarname debug
+syn keyword cfArg contained default delete deletebutton deletefile delimiter delimiters description
+syn keyword cfArg contained destination detail directory disabled display displayname disposition dn domain
+syn keyword cfArg contained enablecab enablecfoutputonly enabled encoded encryption enctype enddate
+syn keyword cfArg contained endrange endrow endtime entry errorcode exception existing expand expires
+syn keyword cfArg contained expireurl expression extendedinfo extends extensions external failifexists
+syn keyword cfArg contained failto file filefield filename filter firstdayofweek firstrowasheaders font
+syn keyword cfArg contained fontbold fontembed fontitalic fontsize foregroundcolor format formfields
+syn keyword cfArg contained formula from generateuniquefilenames getasbinary grid griddataalign gridlines
+syn keyword cfArg contained groovecolor group groupcasesensitive header headeralign headerbold headerfont
+syn keyword cfArg contained headerfontsize headeritalic headerlines headertextcolor height highlighthref
+syn keyword cfArg contained hint href hrefkey hscroll hspace htmltable id idletimeout img imgopen imgstyle
+syn keyword cfArg contained index inline input insert insertbutton interval isolation italic item
+syn keyword cfArg contained itemcolumn key keyonly label labelformat language list listgroups locale
+syn keyword cfArg contained localfile log loginstorage lookandfeel mailerid mailto marginbottom marginleft
+syn keyword cfArg contained marginright marginright margintop markersize markerstyle mask maxlength maxrows
+syn keyword cfArg contained message messagenumber method mimeattach mimetype mode modifytype monthnames
+syn keyword cfArg contained multipart multiple name namecomplict nameconflict namespace new newdirectory
+syn keyword cfArg contained notsupported null numberformat object omit onchange onclick onerror onkeydown
+syn keyword cfArg contained onkeyup onload onmousedown onmouseup onreset onsubmit onvalidate operation
+syn keyword cfArg contained orderby orientation output outputfile overwrite ownerpassword pageencoding
+syn keyword cfArg contained pageheight pagetype pagewidth paintstyle param_1 param_2 param_3 param_4
+syn keyword cfArg contained param_5 parent passive passthrough password path pattern permissions picturebar
+syn keyword cfArg contained pieslicestyle port porttypename prefix preloader preservedata previouscriteria
+syn keyword cfArg contained procedure protocol provider providerdsn proxybypass proxypassword proxyport
+syn keyword cfArg contained proxyserver proxyuser publish query queryasroot queryposition range rebind
+syn keyword cfArg contained recurse redirect referral refreshlabel remotefile replyto report requesttimeout
+syn keyword cfArg contained required reset resolveurl result resultset retrycount returnasbinary returncode
+syn keyword cfArg contained returntype returnvariable roles rowheaderalign rowheaderbold rowheaderfont
+syn keyword cfArg contained rowheaderfontsize rowheaderitalic rowheaders rowheadertextcolor rowheaderwidth
+syn keyword cfArg contained rowheight scale scalefrom scaleto scope scriptprotect scriptsrc secure
+syn keyword cfArg contained securitycontext select selectcolor selected selecteddate selectedindex
+syn keyword cfArg contained selectmode separator seriescolor serieslabel seriesplacement server serviceport
+syn keyword cfArg contained serviceportname sessionmanagement sessiontimeout setclientcookies setcookie
+syn keyword cfArg contained setdomaincookies show3d showborder showdebugoutput showerror showlegend
+syn keyword cfArg contained showmarkers showxgridlines showygridlines size skin sort sortascendingbutton
+syn keyword cfArg contained sortcontrol sortdescendingbutton sortxaxis source spoolenable sql src start
+syn keyword cfArg contained startdate startrange startrow starttime status statuscode statust step
+syn keyword cfArg contained stoponerror style subject suggestions suppresswhitespace tablename tableowner
+syn keyword cfArg contained tablequalifier taglib target task template text textcolor textqualifier
+syn keyword cfArg contained thread throwonerror throwonfailure throwontimeout time timeout timespan tipbgcolor tipstyle
+syn keyword cfArg contained title to tooltip top toplevelvariable transfermode type uid unit url urlpath
+syn keyword cfArg contained useragent username userpassword usetimezoneinfo validate validateat value
+syn keyword cfArg contained valuecolumn values valuesdelimiter valuesdisplay var variable vertical visible
+syn keyword cfArg contained vscroll vspace webservice width wmode wraptext wsdlfile xaxistitle xaxistype
+syn keyword cfArg contained xoffset yaxistitle yaxistype yoffset
 
-" Cold Fusion Functions.
-syn keyword cfFunctionName contained Abs ArrayAppend ArrayAvg ArrayClear ArrayDeleteAt
-syn keyword cfFunctionName contained ArrayInsertAt ArrayIsEmpty ArrayLen ArrayMax
-syn keyword cfFunctionName contained ArrayMin ArrayNew ArrayPrepend ArrayResize ArraySet
-syn keyword cfFunctionName contained ArraySort ArraySum ArraySwap ArrayToList Asc Atn
-syn keyword cfFunctionName contained BitAnd BitMaskClear BitMaskRead BitMaskSet BitNot
-syn keyword cfFunctionName contained BitOr BitSHLN BitSHRN BitXor CJustify Ceiling Chr
-syn keyword cfFunctionName contained Compare CompareNoCase Cos CreateDate CreateDateTime
-syn keyword cfFunctionName contained CreateODBCDate CreateODBCDateTime CreateODBCTime
-syn keyword cfFunctionName contained CreateTime CreateTimeSpan DE DateAdd DateCompare DateDiff
-syn keyword cfFunctionName contained DateFormat DatePart Day DayOfWeek DayOfWeekAsString
-syn keyword cfFunctionName contained DayOfYear DaysInMonth DaysInYear DecimalFormat DecrementValue
-syn keyword cfFunctionName contained Decrypt DeleteClientVariable DirectoryExists DollarFormat
-syn keyword cfFunctionName contained Encrypt Evaluate Exp ExpandPath FileExists Find FindNoCase
-syn keyword cfFunctionName contained FindOneOf FirstDayOfMonth Fix FormatBaseN GetBaseTagData
-syn keyword cfFunctionName contained GetBaseTagList GetClientVariablesList GetDirectoryFromPath
-syn keyword cfFunctionName contained GetFileFromPath GetLocale GetTempDirectory GetTempFile
-syn keyword cfFunctionName contained GetTemplatePath GetTickCount GetToken HTMLCodeFormat
-syn keyword cfFunctionName contained HTMLEditFormat Hour IIf IncrementValue InputBaseN Insert
-syn keyword cfFunctionName contained Int IsArray IsAuthenticated IsAuthorized IsBoolean IsDate
-syn keyword cfFunctionName contained IsDebugMode IsDefined IsLeapYear IsNumeric IsNumericDate
-syn keyword cfFunctionName contained IsQuery IsSimpleValue IsStruct LCase LJustify LSCurrencyFormat
-syn keyword cfFunctionName contained LSDateFormat LSIsCurrency LSIsDate LSIsNumeric LSNumberFormat
-syn keyword cfFunctionName contained LSParseCurrency LSParseDateTime LSParseNumber LSTimeFormat
-syn keyword cfFunctionName contained LTrim Left Len ListAppend ListChangeDelims ListContains
-syn keyword cfFunctionName contained ListContainsNoCase ListDeleteAt ListFind ListFindNoCase ListFirst
-syn keyword cfFunctionName contained ListGetAt ListInsertAt ListLast ListLen ListPrepend ListRest
-syn keyword cfFunctionName contained ListSetAt ListToArray Log Log10 Max Mid Min Minute Month
-syn keyword cfFunctionName contained MonthAsString Now NumberFormat ParagraphFormat ParameterExists
-syn keyword cfFunctionName contained ParseDateTime Pi PreserveSingleQuotes Quarter QueryAddRow
-syn keyword cfFunctionName contained QueryNew QuerySetCell QuotedValueList REFind REFindNoCase
-syn keyword cfFunctionName contained REReplace REReplaceNoCase RJustify RTrim Rand RandRange
-syn keyword cfFunctionName contained Randomize RemoveChars RepeatString Replace ReplaceList
-syn keyword cfFunctionName contained ReplaceNoCase Reverse Right Round Second SetLocale SetVariable
-syn keyword cfFunctionName contained Sgn Sin SpanExcluding SpanIncluding Sqr StripCR StructClear
-syn keyword cfFunctionName contained StructCopy StructCount StructDelete StructFind StructInsert
-syn keyword cfFunctionName contained StructIsEmpty StructKeyExists StructNew StructUpdate Tan
-syn keyword cfFunctionName contained TimeFormat Trim UCase URLEncodedFormat Val ValueList Week
-syn keyword cfFunctionName contained WriteOutput Year YesNoFormat
+" ColdFusion Functions.
+syn keyword cfFunctionName contained Abs GetFunctionList Max ACos GetGatewayHelper Mid AddSOAPRequestHeader
+syn keyword cfFunctionName contained GetHttpRequestData Min AddSOAPResponseHeader GetHttpTimeString Minute
+syn keyword cfFunctionName contained ArrayAppend GetLocale Month ArrayAvg GetLocaleDisplayName MonthAsString
+syn keyword cfFunctionName contained ArrayClear GetMetaData Now ArrayDeleteAt GetMetricData NumberFormat
+syn keyword cfFunctionName contained ArrayInsertAt GetPageContext ParagraphFormat ArrayIsEmpty GetProfileSections
+syn keyword cfFunctionName contained ParseDateTime ArrayLen GetProfileString Pi ArrayMax GetSOAPRequest
+syn keyword cfFunctionName contained PreserveSingleQuotes ArrayMin GetSOAPRequestHeader Quarter ArrayNew
+syn keyword cfFunctionName contained GetSOAPResponse QueryAddColumn ArrayPrepend GetSOAPResponseHeader QueryAddRow
+syn keyword cfFunctionName contained ArrayResize GetTempDirectory QueryNew ArraySet GetTempFile QuerySetCell
+syn keyword cfFunctionName contained ArraySort GetTickCount QuotedValueList ArraySum GetTimeZoneInfo Rand ArraySwap
+syn keyword cfFunctionName contained GetToken Randomize ArrayToList Hash RandRange Asc Hour REFind ASin
+syn keyword cfFunctionName contained HTMLCodeFormat REFindNoCase Atn HTMLEditFormat ReleaseComObject BinaryDecode
+syn keyword cfFunctionName contained IIf RemoveChars BinaryEncode IncrementValue RepeatString BitAnd InputBaseN
+syn keyword cfFunctionName contained Replace BitMaskClear Insert ReplaceList BitMaskRead Int ReplaceNoCase
+syn keyword cfFunctionName contained BitMaskSet IsArray REReplace BitNot IsBinary REReplaceNoCase BitOr IsBoolean
+syn keyword cfFunctionName contained Reverse BitSHLN IsCustomFunction Right BitSHRN IsDate RJustify BitXor
+syn keyword cfFunctionName contained IsDebugMode Round Ceiling IsDefined RTrim CharsetDecode IsLeapYear Second
+syn keyword cfFunctionName contained CharsetEncode IsNumeric SendGatewayMessage Chr IsNumericDate SetEncoding
+syn keyword cfFunctionName contained CJustify IsObject SetLocale Compare IsQuery SetProfileString CompareNoCase
+syn keyword cfFunctionName contained IsSimpleValue SetVariable Cos IsSOAPRequest Sgn CreateDate IsStruct Sin
+syn keyword cfFunctionName contained CreateDateTime IsUserInRole SpanExcluding CreateObject IsValid SpanIncluding
+syn keyword cfFunctionName contained CreateODBCDate IsWDDX Sqr CreateODBCDateTime IsXML StripCR CreateODBCTime
+syn keyword cfFunctionName contained IsXmlAttribute StructAppend CreateTime IsXmlDoc StructClear CreateTimeSpan
+syn keyword cfFunctionName contained IsXmlElem StructCopy CreateUUID IsXmlNode StructCount DateAdd IsXmlRoot
+syn keyword cfFunctionName contained StructDelete DateCompare JavaCast StructFind DateConvert JSStringFormat
+syn keyword cfFunctionName contained StructFindKey DateDiff LCase StructFindValue DateFormat Left StructGet
+syn keyword cfFunctionName contained DatePart Len StructInsert Day ListAppend StructIsEmpty DayOfWeek
+syn keyword cfFunctionName contained ListChangeDelims StructKeyArray DayOfWeekAsString ListContains StructKeyExists
+syn keyword cfFunctionName contained DayOfYear ListContainsNoCase StructKeyList DaysInMonth ListDeleteAt StructNew
+syn keyword cfFunctionName contained DaysInYear ListFind StructSort DE ListFindNoCase StructUpdate DecimalFormat
+syn keyword cfFunctionName contained ListFirst Tan DecrementValue ListGetAt TimeFormat Decrypt ListInsertAt
+syn keyword cfFunctionName contained ToBase64 DeleteClientVariable ListLast ToBinary DirectoryExists ListLen
+syn keyword cfFunctionName contained ToScript DollarFormat ListPrepend ToString Duplicate ListQualify Trim Encrypt
+syn keyword cfFunctionName contained ListRest UCase Evaluate ListSetAt URLDecode Exp ListSort URLEncodedFormat
+syn keyword cfFunctionName contained ExpandPath ListToArray URLSessionFormat FileExists ListValueCount Val Find
+syn keyword cfFunctionName contained ListValueCountNoCase ValueList FindNoCase LJustify Week FindOneOf Log Wrap
+syn keyword cfFunctionName contained FirstDayOfMonth Log10 WriteOutput Fix LSCurrencyFormat XmlChildPos FormatBaseN
+syn keyword cfFunctionName contained LSDateFormat XmlElemNew GetTempDirectory LSEuroCurrencyFormat XmlFormat
+syn keyword cfFunctionName contained GetAuthUser LSIsCurrency XmlGetNodeType GetBaseTagData LSIsDate XmlNew
+syn keyword cfFunctionName contained GetBaseTagList LSIsNumeric XmlParse GetBaseTemplatePath LSNumberFormat
+syn keyword cfFunctionName contained XmlSearch GetClientVariablesList LSParseCurrency XmlTransform
+syn keyword cfFunctionName contained GetCurrentTemplatePath LSParseDateTime XmlValidate GetDirectoryFromPath
+syn keyword cfFunctionName contained LSParseEuroCurrency Year GetEncoding LSParseNumber YesNoFormat GetException
+syn keyword cfFunctionName contained LSTimeFormat GetFileFromPath LTrim 
 
 syn cluster htmlTagNameCluster add=cfTagName
 syn cluster htmlArgCluster add=cfArg,cfFunctionName
@@ -130,7 +153,7 @@ syn region cfFunctionRegion start='#' end='#' contains=cfFunctionName
 
 " Define the default highlighting.
 " For version 5.x and earlier, only when not done already.
-" For version 5.8 and later, only when and item doesn't have highlighting yet.
+" For version 5.8 and later, only when an item doesn't have highlighting yet.
 if version >= 508 || !exists("did_cf_syn_inits")
   if version < 508
     let did_cf_syn_inits = 1
@@ -142,6 +165,7 @@ if version >= 508 || !exists("did_cf_syn_inits")
   HiLink cfTagName Statement
   HiLink cfArg Type
   HiLink cfFunctionName Function
+  HiLink cfFunctionRegion PreProc
 
   delcommand HiLink
 endif