updated for version 7.0097

1 files changed, 118 insertions, 150 deletions

diff --git a/runtime/syntax/lftp.vim b/runtime/syntax/lftp.vim
index fc1958ed3..0aab71eb2 100644
--- a/runtime/syntax/lftp.vim
+++ b/runtime/syntax/lftp.vim
@@ -1,184 +1,152 @@
 " Vim syntax file
-" Language:	    lftp(1) configuration file
-" Maintainer:	    Nikolai Weibull <source@pcppopper.org>
-" URL:		    http://www.pcppopper.org/vim/syntax/pcp/lftp/
-" Latest Revision:  2004-05-22
-" arch-tag:	    f2537c49-5d64-42b8-beb4-13a09dd723d2
+" Language:         lftp(1) configuration file
+" Maintainer:       Nikolai Weibull <nikolai+work.vim@bitwi.se>
+" Latest Revision:  2005-06-27
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
-" Set iskeyword since we need `-' (and potentially others) in keywords.
-" For version 5.x: Set it globally
-" For version 6.x: Set it locally
-if version >= 600
-  command -nargs=1 SetIsk setlocal iskeyword=<args>
-else
-  command -nargs=1 SetIsk set iskeyword=<args>
-endif
-SetIsk 48-57,97-122,-
-delcommand SetIsk
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword=@,48-57,-
 
-" comments
-syn region  lftpComment		display oneline matchgroup=lftpComment start="#" end="$" contains=lftpTodo
+syn region  lftpComment         display oneline matchgroup=lftpComment
+                                \ start='#' end='$' contains=lftpTodo,@Spell
 
-" todo
-syn keyword lftpTodo		contained TODO FIXME XXX NOTE
+syn keyword lftpTodo            contained TODO FIXME XXX NOTE
 
-" strings
-syn region  lftpString		contained display start=+"+ skip=+\\$\|\\"+ end=+"+ end=+$+
+syn region  lftpString          contained display
+                                \ start=+"+ skip=+\\$\|\\"+ end=+"+ end=+$+
 
-" numbers
-syn match   lftpNumber		contained display "\<\d\+\(\.\d\+\)\=\>"
+syn match   lftpNumber          contained display '\<\d\+\(\.\d\+\)\=\>'
 
-" booleans and other things
-syn keyword lftpBoolean		contained yes no on off true false
+syn keyword lftpBoolean         contained yes no on off true false
 
-" intervals
-syn keyword lftpInterval	contained infinity inf never forever
-syn match   lftpInterval	contained "\<\(\d\+\(\.\d\+\)\=[dhms]\)\+\>"
+syn keyword lftpInterval        contained infinity inf never forever
+syn match   lftpInterval        contained '\<\(\d\+\(\.\d\+\)\=[dhms]\)\+\>'
 
-" commands
-syn keyword lftpKeywords	alias anon at bookmark cache cat cd chmod close
-syn keyword lftpKeywords	cls command debug du echo exit fg find get get1
-syn keyword lftpKeywords	glob help history jobs kill lcd lftp lpwd ls
-syn keyword lftpKeywords	mget mirror mkdir module
-syn keyword lftpKeywords	more mput mrm mv nlist open pget put pwd queue
-syn keyword lftpKeywords	quote reget recls rels renlist repeat
-syn keyword lftpKeywords	reput rm rmdir scache site source suspend user
-syn keyword lftpKeywords	version wait zcat zmore
+syn keyword lftpKeywords        alias anon at bookmark cache cat cd chmod close
+                                \ cls command debug du echo exit fg find get
+                                \ get1 glob help history jobs kill lcd lftp
+                                \ lpwd ls mget mirror mkdir module more mput
+                                \ mrm mv nlist open pget put pwd queue quote
+                                \ reget recls rels renlist repeat reput rm
+                                \ rmdir scache site source suspend user version
+                                \ wait zcat zmore
 
-" settings
-syn region  lftpSet		matchgroup=lftpKeywords start="set" end=";" end="$" contains=lftpString,lftpNumber,lftpBoolean,lftpInterval,lftpSettingsPrefix,lftpSettings
-syn match   lftpSettingsPrefix	contained '\<\%(bmk\|cache\|cmd\|color\|dns\):'
-syn match   lftpSettingsPrefix	contained '\<\%(file\|fish\|ftp\|hftp\):'
-syn match   lftpSettingsPrefix	contained '\<\%(http\|https\|mirror\|module\):'
-syn match   lftpSettingsPrefix	contained '\<\%(net\|sftp\|ssl\|xfer\):'
+syn region  lftpSet             matchgroup=lftpKeywords
+                                \ start="set" end=";" end="$"
+                                \ contains=lftpString,lftpNumber,lftpBoolean,
+                                \ lftpInterval,lftpSettingsPrefix,lftpSettings
+syn match   lftpSettingsPrefix  contained '\<\%(bmk\|cache\|cmd\|color\|dns\):'
+syn match   lftpSettingsPrefix  contained '\<\%(file\|fish\|ftp\|hftp\):'
+syn match   lftpSettingsPrefix  contained '\<\%(http\|https\|mirror\|module\):'
+syn match   lftpSettingsPrefix  contained '\<\%(net\|sftp\|ssl\|xfer\):'
 " bmk:
-syn keyword lftpSettings	contained save-p[asswords]
+syn keyword lftpSettings        contained save-p[asswords]
 " cache:
-syn keyword lftpSettings	contained cache-em[pty-listings] en[able]
-syn keyword lftpSettings	contained exp[ire] siz[e]
+syn keyword lftpSettings        contained cache-em[pty-listings] en[able]
+                                \ exp[ire] siz[e]
 " cmd:
-syn keyword lftpSettings	contained at[-exit] cls-c[ompletion-default]
-syn keyword lftpSettings	contained cls-d[efault] cs[h-history]
-syn keyword lftpSettings	contained default-p[rotocol] default-t[itle]
-syn keyword lftpSettings	contained fai[l-exit] in[teractive]
-syn keyword lftpSettings	contained lo[ng-running] ls[-default]
-syn keyword lftpSettings	contained mo[ve-background] prom[pt]
-syn keyword lftpSettings	contained rem[ote-completion]
-syn keyword lftpSettings	contained save-c[wd-history] save-r[l-history]
-syn keyword lftpSettings	contained set-t[erm-status] statu[s-interval]
-syn keyword lftpSettings	contained te[rm-status] verb[ose] verify-h[ost]
-syn keyword lftpSettings	contained verify-path verify-path[-cached]
+syn keyword lftpSettings        contained at[-exit] cls-c[ompletion-default]
+                                \ cls-d[efault] cs[h-history]
+                                \ default-p[rotocol] default-t[itle]
+syn keyword lftpSettings        contained fai[l-exit] in[teractive]
+                                \ lo[ng-running] ls[-default] mo[ve-background]
+                                \ prom[pt]
+                                \ rem[ote-completion]
+                                \ save-c[wd-history] save-r[l-history]
+                                \ set-t[erm-status] statu[s-interval]
+                                \ te[rm-status] verb[ose] verify-h[ost]
+                                \ verify-path verify-path[-cached]
 " color:
-syn keyword lftpSettings	contained dir[-colors] use-c[olor]
+syn keyword lftpSettings        contained dir[-colors] use-c[olor]
 " dns:
-syn keyword lftpSettings	contained S[RV-query] cache-en[able]
-syn keyword lftpSettings	contained cache-ex[pire] cache-s[ize]
-syn keyword lftpSettings	contained fat[al-timeout] o[rder] use-fo[rk]
+syn keyword lftpSettings        contained S[RV-query] cache-en[able]
+                                \ cache-ex[pire] cache-s[ize]
+                                \ fat[al-timeout] o[rder] use-fo[rk]
 " file:
-syn keyword lftpSettings	contained ch[arset]
+syn keyword lftpSettings        contained ch[arset]
 " fish:
-syn keyword lftpSettings	contained connect[-program] sh[ell]
+syn keyword lftpSettings        contained connect[-program] sh[ell]
 " ftp:
-syn keyword lftpSettings	contained acct anon-p[ass] anon-u[ser]
-syn keyword lftpSettings	contained au[to-sync-mode] b[ind-data-socket]
-syn keyword lftpSettings	contained ch[arset] cli[ent] dev[ice-prefix]
-syn keyword lftpSettings	contained fi[x-pasv-address] fxp-f[orce]
-syn keyword lftpSettings	contained fxp-p[assive-source] h[ome] la[ng]
-syn keyword lftpSettings	contained list-e[mpty-ok] list-o[ptions]
-syn keyword lftpSettings	contained nop[-interval] pas[sive-mode]
-syn keyword lftpSettings	contained port-i[pv4] port-r[ange] prox[y]
-syn keyword lftpSettings	contained rest-l[ist] rest-s[tor]
-syn keyword lftpSettings	contained retry-530 retry-530[-anonymous]
-syn keyword lftpSettings	contained sit[e-group] skey-a[llow]
-syn keyword lftpSettings	contained skey-f[orce] ssl-allow
-syn keyword lftpSettings	contained ssl-allow[-anonymous] ssl-au[th]
-syn keyword lftpSettings	contained ssl-f[orce] ssl-protect-d[ata]
-syn keyword lftpSettings	contained ssl-protect-l[ist] stat-[interval]
-syn keyword lftpSettings	contained sy[nc-mode] timez[one] use-a[bor]
-syn keyword lftpSettings	contained use-fe[at] use-fx[p] use-hf[tp]
-syn keyword lftpSettings	contained use-mdtm use-mdtm[-overloaded]
-syn keyword lftpSettings	contained use-ml[sd] use-p[ret] use-q[uit]
-syn keyword lftpSettings	contained use-site-c[hmod] use-site-i[dle]
-syn keyword lftpSettings	contained use-site-u[time] use-siz[e]
-syn keyword lftpSettings	contained use-st[at] use-te[lnet-iac]
-syn keyword lftpSettings	contained verify-a[ddress] verify-p[ort]
-syn keyword lftpSettings	contained w[eb-mode]
+syn keyword lftpSettings        contained acct anon-p[ass] anon-u[ser]
+                                \ au[to-sync-mode] b[ind-data-socket]
+                                \ ch[arset] cli[ent] dev[ice-prefix]
+                                \ fi[x-pasv-address] fxp-f[orce]
+                                \ fxp-p[assive-source] h[ome] la[ng]
+                                \ list-e[mpty-ok] list-o[ptions]
+                                \ nop[-interval] pas[sive-mode]
+                                \ port-i[pv4] port-r[ange] prox[y]
+                                \ rest-l[ist] rest-s[tor]
+                                \ retry-530 retry-530[-anonymous]
+                                \ sit[e-group] skey-a[llow]
+                                \ skey-f[orce] ssl-allow
+                                \ ssl-allow[-anonymous] ssl-au[th]
+                                \ ssl-f[orce] ssl-protect-d[ata]
+                                \ ssl-protect-l[ist] stat-[interval]
+                                \ sy[nc-mode] timez[one] use-a[bor]
+                                \ use-fe[at] use-fx[p] use-hf[tp]
+                                \ use-mdtm use-mdtm[-overloaded]
+                                \ use-ml[sd] use-p[ret] use-q[uit]
+                                \ use-site-c[hmod] use-site-i[dle]
+                                \ use-site-u[time] use-siz[e]
+                                \ use-st[at] use-te[lnet-iac]
+                                \ verify-a[ddress] verify-p[ort]
+                                \ w[eb-mode]
 " hftp:
-syn keyword lftpSettings	contained w[eb-mode] cache prox[y]
-syn keyword lftpSettings	contained use-au[thorization] use-he[ad]
-syn keyword lftpSettings	contained use-ty[pe]
+syn keyword lftpSettings        contained w[eb-mode] cache prox[y]
+                                \ use-au[thorization] use-he[ad] use-ty[pe]
 " http:
-syn keyword lftpSettings	contained accept accept-c[harset]
-syn keyword lftpSettings	contained accept-l[anguage] cache coo[kie]
-syn keyword lftpSettings	contained pos[t-content-type] prox[y]
-syn keyword lftpSettings	contained put-c[ontent-type] put-m[ethod]
-syn keyword lftpSettings	contained ref[erer] set-c[ookies] user[-agent]
+syn keyword lftpSettings        contained accept accept-c[harset]
+                                \ accept-l[anguage] cache coo[kie]
+                                \ pos[t-content-type] prox[y]
+                                \ put-c[ontent-type] put-m[ethod] ref[erer]
+                                \ set-c[ookies] user[-agent]
 " https:
-syn keyword lftpSettings	contained prox[y]
+syn keyword lftpSettings        contained prox[y]
 " mirror:
-syn keyword lftpSettings	contained exc[lude-regex] o[rder]
-syn keyword lftpSettings	contained parallel-d[irectories]
-syn keyword lftpSettings	contained parallel-t[ransfer-count]
-syn keyword lftpSettings	contained use-p[get-n]
+syn keyword lftpSettings        contained exc[lude-regex] o[rder]
+                                \ parallel-d[irectories]
+                                \ parallel-t[ransfer-count] use-p[get-n]
 " module:
-syn keyword lftpSettings	contained pat[h]
+syn keyword lftpSettings        contained pat[h]
 " net:
-syn keyword lftpSettings	contained connection-l[imit]
-syn keyword lftpSettings	contained connection-t[akeover]
-syn keyword lftpSettings	contained id[le] limit-m[ax] limit-r[ate]
-syn keyword lftpSettings	contained limit-total-m[ax] limit-total-r[ate]
-syn keyword lftpSettings	contained max-ret[ries] no-[proxy]
-syn keyword lftpSettings	contained pe[rsist-retries]
-syn keyword lftpSettings	contained reconnect-interval-b[ase]
-syn keyword lftpSettings	contained reconnect-interval-ma[x]
-syn keyword lftpSettings	contained reconnect-interval-mu[ltiplier]
-syn keyword lftpSettings	contained socket-bind-ipv4 socket-bind-ipv6
-syn keyword lftpSettings	contained socket-bu[ffer] socket-m[axseg]
-syn keyword lftpSettings	contained timeo[ut]
+syn keyword lftpSettings        contained connection-l[imit]
+                                \ connection-t[akeover] id[le] limit-m[ax]
+                                \ limit-r[ate] limit-total-m[ax]
+                                \ limit-total-r[ate] max-ret[ries] no-[proxy]
+                                \ pe[rsist-retries] reconnect-interval-b[ase]
+                                \ reconnect-interval-ma[x]
+                                \ reconnect-interval-mu[ltiplier]
+                                \ socket-bind-ipv4 socket-bind-ipv6
+                                \ socket-bu[ffer] socket-m[axseg] timeo[ut]
 " sftp:
-syn keyword lftpSettings	contained connect[-program]
-syn keyword lftpSettings	contained max-p[ackets-in-flight]
-syn keyword lftpSettings	contained prot[ocol-version] ser[ver-program]
-syn keyword lftpSettings	contained size-r[ead] size-w[rite]
+syn keyword lftpSettings        contained connect[-program]
+                                \ max-p[ackets-in-flight] prot[ocol-version]
+                                \ ser[ver-program] size-r[ead] size-w[rite]
 " ssl:
-syn keyword lftpSettings	contained ca-f[ile] ca-p[ath] ce[rt-file]
-syn keyword lftpSettings	contained crl-f[ile] crl-p[ath] k[ey-file]
-syn keyword lftpSettings	contained verify-c[ertificate]
+syn keyword lftpSettings        contained ca-f[ile] ca-p[ath] ce[rt-file]
+                                \ crl-f[ile] crl-p[ath] k[ey-file]
+                                \ verify-c[ertificate]
 " xfer:
-syn keyword lftpSettings	contained clo[bber] dis[k-full-fatal]
-syn keyword lftpSettings	contained eta-p[eriod] eta-t[erse]
-syn keyword lftpSettings	contained mak[e-backup] max-red[irections]
-syn keyword lftpSettings	contained ra[te-period]
+syn keyword lftpSettings        contained clo[bber] dis[k-full-fatal]
+                                \ eta-p[eriod] eta-t[erse] mak[e-backup]
+                                \ max-red[irections] ra[te-period]
 
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lftp_syn_inits")
-  if version < 508
-    let did_lftp_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink lftpComment		Comment
-  HiLink lftpTodo		Todo
-  HiLink lftpString		String
-  HiLink lftpNumber		Number
-  HiLink lftpBoolean		Boolean
-  HiLink lftpInterval		Number
-  HiLink lftpKeywords		Keyword
-  HiLink lftpSettingsPrefix	PreProc
-  HiLink lftpSettings		Type
-  delcommand HiLink
-endif
+hi def link lftpComment         Comment
+hi def link lftpTodo            Todo
+hi def link lftpString          String
+hi def link lftpNumber          Number
+hi def link lftpBoolean         Boolean
+hi def link lftpInterval        Number
+hi def link lftpKeywords        Keyword
+hi def link lftpSettingsPrefix  PreProc
+hi def link lftpSettings        Type
 
 let b:current_syntax = "lftp"
 
-" vim: set sts=2 sw=2:
+let &cpo = s:cpo_save
+unlet s:cpo_save