updated for version 7.0b

2006-03-24 22:21:52 +00:00
parent db552d60ec
commit c01140a1a0
173 changed files with 4011 additions and 2470 deletions
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1,7 +1,7 @@
 " netrw.vim: Handles file transfer and remote directory listing across a network
 "            AUTOLOAD PORTION
-" Date:		Mar 21, 2006
-" Version:	82
+" Date:		Mar 22, 2006
+" Version:	83
 " Maintainer:	Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
@@ -23,7 +23,7 @@
 if &cp || exists("g:loaded_netrw")
  finish
 endif
-let g:loaded_netrw = "v82"
+let g:loaded_netrw = "v83"
 if v:version < 700
 echohl WarningMsg | echo "***netrw*** you need vim version 7.0 or later for version ".g:loaded_netrw." of netrw" | echohl None
 finish
@@ -1280,6 +1280,8 @@ fun! s:NetBrowse(dirname)
  setlocal bt=nofile nobl nonu noswf
  if g:netrw_fastbrowse >= 1
   setlocal bh=hide
+  else
+   setlocal bh=delete
  endif

  " save current directory on directory history list
@@ -1508,6 +1510,8 @@ fun! s:NetBrowseChgDir(dirname,newdir)
   setlocal ma nobl
   if g:netrw_fastbrowse >= 1
    setlocal bh=hide
+   else
+    setlocal bh=delete
   endif
   %d

@@ -1538,7 +1542,7 @@ endfun
 " ---------------------------------------------------------------------
 "  NetGetWord: it gets the directory named under the cursor {{{2
 fun! s:NetGetWord()
-"  call Dfunc("NetGetWord() line#".line("."))
+"  call Dfunc("NetGetWord() line#".line(".")." longlist=".g:netrw_longlist." virtcol=".virtcol("."))
  call s:UseBufWinVars()

  " insure that w:netrw_longlist is set up
@@ -1548,6 +1552,7 @@ fun! s:NetGetWord()
   else
    let w:netrw_longlist= 0
   endif
+"   call Decho("w:netrw_longlist=".w:netrw_longlist)
  endif

  if exists("w:netrw_bannercnt") && line(".") < w:netrw_bannercnt
@@ -1596,7 +1601,7 @@ fun! s:NetGetWord()
   endif

   let filestart = (virtcol(".")/b:netrw_cpf)*b:netrw_cpf
-"   call Decho("virtcol=".virtcol(".")." cpf=".b:netrw_cpf." bannercnt=".w:netrw_bannercnt." filestart=".filestart)
+"   call Decho("filestart= ([virtcol=".virtcol(".")."]/[b:netrw_cpf=".b:netrw_cpf."])*b:netrw_cpf=".filestart."  bannercnt=".w:netrw_bannercnt)
 "   call Decho("1: dirname<".dirname.">")
   if filestart > 0|let dirname= substitute(dirname,'^.\{'.filestart.'}','','')|endif
 "   call Decho("2: dirname<".dirname.">")
@@ -1613,7 +1618,7 @@ endfun
 " ---------------------------------------------------------------------
 " NetBrowseRm: remove/delete a remote file or directory {{{2
 fun! s:NetBrowseRm(usrhost,path) range
-"  call Dfunc("NetBrowseRm(usrhost<".a:usrhost."> path<".a:path.">)")
+"  call Dfunc("NetBrowseRm(usrhost<".a:usrhost."> path<".a:path.">) virtcol=".virtcol("."))
 "  call Decho("firstline=".a:firstline." lastline=".a:lastline)

  " preparation for removing multiple files/directories
@@ -1624,7 +1629,6 @@ fun! s:NetBrowseRm(usrhost,path) range
  while ctr <= a:lastline
   exe ctr

-   norm! 0
   let rmfile= s:NetGetWord()
 "   call Decho("rmfile<".rmfile.">")

@@ -2849,6 +2853,8 @@ fun! netrw#DirBrowse(dirname)
  setlocal bt=nofile nobl ma nonu noswf nowrap
  if g:netrw_fastbrowse >= 2
   setlocal bh=hide
+  else
+   setlocal bh=delete
  endif
  keepalt silent! %d

@@ -3178,7 +3184,7 @@ fun! s:LocalBrowseShellCmdRefresh()
  for ibuf in s:netrw_browselist
   if bufwinnr(ibuf) == -1
 "    call Decho("wiping  buf#".ibuf)
-    exe "bw ".ibuf
+    exe "silent! bw ".ibuf
    call remove(s:netrw_browselist,ibl)
 "    call Decho("browselist=".string(s:netrw_browselist))
    continue
@@ -3898,11 +3904,11 @@ fun! s:NetOptionSave()

  " Get Temporary Filename
  let w:aikeep   = &ai
-  " record autochdir setting and then insure its unset (tnx to David Fishburn)
-  if &acd && (has("netbeans_intg") || has("sun_workshop"))
-   set noacd
-   echohl Warning | echomsg "***warning*** directory browsing and the acd setting are incompatible" |echohl None
-  endif
+"  " netrw and the acd option do not work together properly
+"  if &acd && (has("netbeans_intg") || has("sun_workshop"))
+"   set noacd
+"   echohl Warning | echomsg "***warning*** directory browsing and the acd setting are incompatible" |echohl None
+"  endif
  let w:fokeep    = &fo
  let w:aikeep    = &ai
  let w:cikeep    = &ci
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -75,7 +75,7 @@ fun! zip#Browse(zipfile)
  0d
  $

-  call Decho("exe silent r! unzip -l '".escape(a:zipfile,s:zipfile_escape)."'")
+"  call Decho("exe silent r! unzip -l '".escape(a:zipfile,s:zipfile_escape)."'")
  exe "silent r! unzip -l '".escape(a:zipfile,s:zipfile_escape)."'"
  $d
  silent 4,$v/^\s\+\d\+\s\{0,5}\d/d
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -123,6 +123,7 @@ DOCS = \
 	usr_29.txt \
 	usr_30.txt \
 	usr_31.txt \
+	usr_32.txt \
 	usr_40.txt \
 	usr_41.txt \
 	usr_42.txt \
@@ -251,6 +252,7 @@ HTMLS = \
 	usr_29.html \
 	usr_30.html \
 	usr_31.html \
+	usr_32.html \
 	usr_40.html \
 	usr_41.html \
 	usr_42.html \
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 15
+*autocmd.txt*   For Vim version 7.0b.  Last change: 2006 Mar 15


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 16
+*change.txt*    For Vim version 7.0b.  Last change: 2006 Mar 16


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 16
+*cmdline.txt*   For Vim version 7.0b.  Last change: 2006 Mar 16


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/debug.txt
+++ b/runtime/doc/debug.txt
@@ -1,4 +1,4 @@
-*debug.txt*     For Vim version 7.0aa.  Last change: 2005 Dec 17
+*debug.txt*     For Vim version 7.0b.  Last change: 2005 Dec 17


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/debugger.txt
+++ b/runtime/doc/debugger.txt
@@ -1,4 +1,4 @@
-*debugger.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 29
+*debugger.txt*  For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Gordon Prieur
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -1,4 +1,4 @@
-*develop.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 09
+*develop.txt*   For Vim version 7.0b.  Last change: 2006 Mar 09


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 15
+*diff.txt*      For Vim version 7.0b.  Last change: 2006 Mar 15


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -1,4 +1,4 @@
-*digraph.txt*   For Vim version 7.0aa.  Last change: 2005 Sep 11
+*digraph.txt*   For Vim version 7.0b.  Last change: 2005 Sep 11


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 06
+*editing.txt*   For Vim version 7.0b.  Last change: 2006 Mar 06


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.0aa.  Last change: 2005 Sep 10
+*fold.txt*      For Vim version 7.0b.  Last change: 2005 Sep 10


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.0aa.  Last change: 2006 Mar 20
+*gui.txt*       For Vim version 7.0b.  Last change: 2006 Mar 20


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/gui_w16.txt
+++ b/runtime/doc/gui_w16.txt
@@ -1,4 +1,4 @@
-*gui_w16.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
+*gui_w16.txt*   For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/gui_w32.txt
+++ b/runtime/doc/gui_w32.txt
@@ -1,4 +1,4 @@
-*gui_w32.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
+*gui_w32.txt*   For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/gui_x11.txt
+++ b/runtime/doc/gui_x11.txt
@@ -1,4 +1,4 @@
-*gui_x11.txt*   For Vim version 7.0aa.  Last change: 2005 Dec 06
+*gui_x11.txt*   For Vim version 7.0b.  Last change: 2005 Dec 06


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/hangulin.txt
+++ b/runtime/doc/hangulin.txt
@@ -1,4 +1,4 @@
-*hangulin.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 29
+*hangulin.txt*  For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Chi-Deok Hwang and Sung-Hyun Nam
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 7.0aa.  Last change: 2006 Mar 17
+*help.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24

 			VIM - main help file
 									 k
@@ -71,6 +71,7 @@ Editing Effectively ~
 |usr_29.txt|  Moving through programs
 |usr_30.txt|  Editing programs
 |usr_31.txt|  Exploiting the GUI
+|usr_32.txt|  The undo tree

 Tuning Vim ~
 |usr_40.txt|  Make new commands
@@ -194,13 +195,6 @@ Standard plugins ~
 |pi_zip.txt|	Zip archive explorer

 LOCAL ADDITIONS:				*local-additions*
-|cecutil.txt|	DrChip's Utilities				Jun 11, 2004
-|engspchk.txt|	English Spelling Checker   (v61)	Mar 14, 2005
-|example.txt|	Example for a locally added help file
-|matchit.txt|   Extended "%" matching
-|test.txt|	Testing the hélp cömmånd nôw
-|typecorr.txt|	Plugin for correcting typing mistakes
-|helpp.txt|	Dummy line to avoid an error message

 ------------------------------------------------------------------------------
 *bars*		Bars example
--- a/runtime/doc/if_cscop.txt
+++ b/runtime/doc/if_cscop.txt
@@ -1,4 +1,4 @@
-*if_cscop.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 29
+*if_cscop.txt*  For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Andy Kahn
--- a/runtime/doc/if_mzsch.txt
+++ b/runtime/doc/if_mzsch.txt
@@ -1,4 +1,4 @@
-*if_mzsch.txt*  For Vim version 7.0aa.  Last change: 2006 Mar 06
+*if_mzsch.txt*  For Vim version 7.0b.  Last change: 2006 Mar 06


 		  VIM REFERENCE MANUAL    by Sergey Khorev
--- a/runtime/doc/if_ole.txt
+++ b/runtime/doc/if_ole.txt
@@ -1,4 +1,4 @@
-*if_ole.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 06
+*if_ole.txt*    For Vim version 7.0b.  Last change: 2006 Mar 06


 		  VIM REFERENCE MANUAL    by Paul Moore
--- a/runtime/doc/if_perl.txt
+++ b/runtime/doc/if_perl.txt
@@ -1,4 +1,4 @@
-*if_perl.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 06
+*if_perl.txt*   For Vim version 7.0b.  Last change: 2006 Mar 06


 		  VIM REFERENCE MANUAL    by Sven Verdoolaege
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -1,4 +1,4 @@
-*if_pyth.txt*   For Vim version 7.0aa.  Last change: 2006 Jan 20
+*if_pyth.txt*   For Vim version 7.0b.  Last change: 2006 Jan 20


 		  VIM REFERENCE MANUAL    by Paul Moore
--- a/runtime/doc/if_ruby.txt
+++ b/runtime/doc/if_ruby.txt
@@ -1,4 +1,4 @@
-*if_ruby.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 06
+*if_ruby.txt*   For Vim version 7.0b.  Last change: 2006 Mar 06


 		  VIM REFERENCE MANUAL    by Shugo Maeda
--- a/runtime/doc/if_sniff.txt
+++ b/runtime/doc/if_sniff.txt
@@ -1,4 +1,4 @@
-*if_sniff.txt*	For Vim version 7.0aa.  Last change: 2005 Mar 29
+*if_sniff.txt*	For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL
--- a/runtime/doc/if_tcl.txt
+++ b/runtime/doc/if_tcl.txt
@@ -1,4 +1,4 @@
-*if_tcl.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 06
+*if_tcl.txt*    For Vim version 7.0b.  Last change: 2006 Mar 06


 		  VIM REFERENCE MANUAL    by Ingo Wilken
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -1,4 +1,4 @@
-*indent.txt*    For Vim version 7.0aa.  Last change: 2005 Aug 30
+*indent.txt*    For Vim version 7.0b.  Last change: 2005 Aug 30


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.0aa.  Last change: 2006 Mar 20
+*index.txt*     For Vim version 7.0b.  Last change: 2006 Mar 24


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1088,6 +1088,7 @@ The commands are sorted on the non-optional part of their name.
 |:cexpr|	:cex[pr]	read errors from expr and jump to first
 |:cfile|	:cf[ile]	read file with error messages and jump to first
 |:cfirst|	:cfir[st]	go to the specified error, default first one
+|:cgetbuffer|	:cgetb[uffer]	get errors from buffer
 |:cgetexpr|	:cgete[xpr]	get errors from expr
 |:cgetfile|	:cg[etfile]	read file with error messages
 |:changes|	:cha[nges]	print the change list
@@ -1242,6 +1243,7 @@ The commands are sorted on the non-optional part of their name.
 |:lexpr|	:lex[pr]	read locations from expr and jump to first
 |:lfile|	:lf[ile]	read file with locations and jump to first
 |:lfirst|	:lfir[st]	go to the specified location, default first one
+|:lgetbuffer|	:lgetb[uffer]	get locations from buffer
 |:lgetexpr|	:lgete[xpr]	get locations from expr
 |:lgetfile|	:lg[etfile]	read file with locations
 |:lgrep|	:lgr[ep]	run 'grepprg' and jump to first match
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 21
+*insert.txt*    For Vim version 7.0b.  Last change: 2006 Mar 21


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.0aa.  Last change: 2006 Mar 20
+*map.txt*       For Vim version 7.0b.  Last change: 2006 Mar 20


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 7.0aa.  Last change: 2006 Mar 05
+*mbyte.txt*     For Vim version 7.0b.  Last change: 2006 Mar 05


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 01
+*message.txt*   For Vim version 7.0b.  Last change: 2006 Mar 01


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/mlang.txt
+++ b/runtime/doc/mlang.txt
@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 7.0aa.  Last change: 2004 Feb 24
+*mlang.txt*     For Vim version 7.0b.  Last change: 2004 Feb 24


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.0aa.  Last change: 2006 Jan 02
+*motion.txt*    For Vim version 7.0b.  Last change: 2006 Jan 02


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -1,4 +1,4 @@
-*netbeans.txt*  For Vim version 7.0aa.  Last change: 2006 Mar 09
+*netbeans.txt*  For Vim version 7.0b.  Last change: 2006 Mar 09


 		  VIM REFERENCE MANUAL    by Gordon Prieur
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2006 Mar 18
+*options.txt*	For Vim version 7.0b.  Last change: 2006 Mar 18


 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
--- a/runtime/doc/os_390.txt
+++ b/runtime/doc/os_390.txt
@@ -1,4 +1,4 @@
-*os_390.txt*    For Vim version 7.0aa.  Last change: 2005 Mar 29
+*os_390.txt*    For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL	  by Ralf Schandl
--- a/runtime/doc/os_beos.txt
+++ b/runtime/doc/os_beos.txt
@@ -1,4 +1,4 @@
-*os_beos.txt*	For Vim version 7.0aa.  Last change: 2005 Mar 29
+*os_beos.txt*	For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/os_mac.txt
+++ b/runtime/doc/os_mac.txt
@@ -1,4 +1,4 @@
-*os_mac.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 09
+*os_mac.txt*    For Vim version 7.0b.  Last change: 2006 Mar 09


 		  VIM REFERENCE MANUAL    by Bram Moolenaar et al.
--- a/runtime/doc/os_mint.txt
+++ b/runtime/doc/os_mint.txt
@@ -1,4 +1,4 @@
-*os_mint.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
+*os_mint.txt*   For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Jens M. Felderhoff
--- a/runtime/doc/os_msdos.txt
+++ b/runtime/doc/os_msdos.txt
@@ -1,4 +1,4 @@
-*os_msdos.txt*  For Vim version 7.0aa.  Last change: 2005 Mar 29
+*os_msdos.txt*  For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/os_os2.txt
+++ b/runtime/doc/os_os2.txt
@@ -1,4 +1,4 @@
-*os_os2.txt*    For Vim version 7.0aa.  Last change: 2005 Mar 29
+*os_os2.txt*    For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Paul Slootman
--- a/runtime/doc/os_qnx.txt
+++ b/runtime/doc/os_qnx.txt
@@ -1,4 +1,4 @@
-*os_qnx.txt*    For Vim version 7.0aa.  Last change: 2005 Mar 29
+*os_qnx.txt*    For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Julian Kinraid
--- a/runtime/doc/os_risc.txt
+++ b/runtime/doc/os_risc.txt
@@ -1,4 +1,4 @@
-*os_risc.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
+*os_risc.txt*   For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Thomas Leonard
--- a/runtime/doc/os_unix.txt
+++ b/runtime/doc/os_unix.txt
@@ -1,4 +1,4 @@
-*os_unix.txt*   For Vim version 7.0aa.  Last change: 2005 Mar 29
+*os_unix.txt*   For Vim version 7.0b.  Last change: 2005 Mar 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/os_vms.txt
+++ b/runtime/doc/os_vms.txt
@@ -1,4 +1,4 @@
-*os_vms.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 02
+*os_vms.txt*    For Vim version 7.0b.  Last change: 2006 Mar 02


 		  VIM REFERENCE MANUAL
--- a/runtime/doc/pi_gzip.txt
+++ b/runtime/doc/pi_gzip.txt
@@ -1,4 +1,4 @@
-*pi_gzip.txt*   For Vim version 7.0aa.  Last change: 2002 Oct 29
+*pi_gzip.txt*   For Vim version 7.0b.  Last change: 2002 Oct 29


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 7.0.  Last change: Mar 21, 2006
+*pi_netrw.txt*  For Vim version 7.0b.  Last change: Mar 22, 2006

 		VIM REFERENCE MANUAL    by Charles E. Campbell, Jr.

@@ -365,7 +365,7 @@ Both the :Nread and the :Nwrite ex-commands can accept multiple filenames.
 NETRC							*netrw-netrc*

 The typical syntax for lines in a <.netrc> file is given as shown below.
-Ftp under Unix usually support <.netrc>; Windows' ftp usually doesn't.
+Ftp under Unix usually supports <.netrc>; ftp under Windows usually doesn't.
 >
 	machine {full machine name} login {user-id} password "{password}"
 	default login {user-id} password "{password}"
@@ -395,11 +395,12 @@ However, |netrw-listhack| can help with this problem.
 ==============================================================================
 4. Activation						*netrw-activate*

-Network-oriented file transfers are available by default whenever
+Network-oriented file transfers are available by default whenever Vim's
 |'nocompatible'| mode is enabled.  The <netrw.vim> file resides in your
 system's vim-plugin directory and is sourced automatically whenever you bring
 up vim.  I suggest that, at a minimum, you have at least the following in your
 <.vimrc> customization file: >
+
 	set nocp
 	if version >= 600
 	  filetype plugin indent on
@@ -420,11 +421,14 @@ Thus one may use files across networks just as simply as if they were local. >
 See |netrw-activate| for more on how to encourage your vim to use plugins
 such as netrw.

+
 ==============================================================================
 6. Ex Commands						*netrw-ex*

-The usual read/write commands are supported.  There are also a couple of
-additional commands available.
+The usual read/write commands are supported.  There are also a few
+additional commands available.  Often you won't need to use Nw or
+Nread as shown in |netrw-transparent| (ie. use :e url, :r url, :w url;
+see |netrw-urls|).

 :[range]Nw	Write the specified lines to the current
 		file as specified in b:netrw_lastfile.
@@ -455,7 +459,7 @@ additional commands available.
 		strings.

 :NetrwSettings  This command is desribed in |netrw-settings| -- used to
-                display netrw settings and change netrw behavior
+                display netrw settings and change netrw behavior.


 ==============================================================================
@@ -1444,6 +1448,10 @@ which is loaded automatically at startup (assuming :set nocp).
 ==============================================================================
 11. History						*netrw-history* {{{1

+	v83: * disabled stop-acd handling; the change in directory handling
+	       may allow acd to be used again.  Awaiting feedback.
+	     * D was refusing to delete remote files/directories in wide
+	       listing mode.
 	v81: * FocusGained also used to refresh/wipe local browser directory
 	       buffers
 	     * (bugfix) netrw was leaving [Scratch] buffers behind when the
--- a/runtime/doc/pi_paren.txt
+++ b/runtime/doc/pi_paren.txt
@@ -1,4 +1,4 @@
-*pi_paren.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 01
+*pi_paren.txt*  For Vim version 7.0b.  Last change: 2006 Mar 24


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/pi_tar.txt
+++ b/runtime/doc/pi_tar.txt
@@ -1,4 +1,6 @@
-*tar.txt*	Tar File Interface				Dec 21, 2005
+*tar.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24
+
+	Tar File Interface

 Author:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -1,4 +1,6 @@
-*zip.txt*	Zip File Interface				Mar 22, 2006
+*zip.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24
+
+	Zip File Interface

 Author:  Charles E. Campbell, Jr.  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)
--- a/runtime/doc/print.txt
+++ b/runtime/doc/print.txt
@@ -1,4 +1,4 @@
-*print.txt*     For Vim version 7.0aa.  Last change: 2005 Apr 01
+*print.txt*     For Vim version 7.0b.  Last change: 2005 Apr 01


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.0aa.  Last change: 2006 Mar 23
+*quickref.txt*  For Vim version 7.0b.  Last change: 2006 Mar 23


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/recover.txt
+++ b/runtime/doc/recover.txt
@@ -1,4 +1,4 @@
-*recover.txt*   For Vim version 7.0aa.  Last change: 2005 Dec 12
+*recover.txt*   For Vim version 7.0b.  Last change: 2005 Dec 12


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/rileft.txt
+++ b/runtime/doc/rileft.txt
@@ -1,4 +1,4 @@
-*rileft.txt*    For Vim version 7.0aa.  Last change: 2005 Apr 04
+*rileft.txt*    For Vim version 7.0b.  Last change: 2005 Apr 04


 		  VIM REFERENCE MANUAL    by Avner Lottem
--- a/runtime/doc/russian.txt
+++ b/runtime/doc/russian.txt
@@ -1,4 +1,4 @@
-*russian.txt*   For Vim version 7.0aa.  Last change: 2005 Apr 01
+*russian.txt*   For Vim version 7.0b.  Last change: 2005 Apr 01


 		  VIM REFERENCE MANUAL    by Vassily Ragosin
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -1,4 +1,4 @@
-*sign.txt*      For Vim version 7.0aa.  Last change: 2005 Apr 04
+*sign.txt*      For Vim version 7.0b.  Last change: 2005 Apr 04


 		  VIM REFERENCE MANUAL    by Gordon Prieur
--- a/runtime/doc/sponsor.txt
+++ b/runtime/doc/sponsor.txt
@@ -1,4 +1,4 @@
-*sponsor.txt*   For Vim version 7.0aa.  Last change: 2004 Jun 16
+*sponsor.txt*   For Vim version 7.0b.  Last change: 2006 Mar 24


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -7,13 +7,13 @@

 SPONSOR VIM DEVELOPMENT						*sponsor*

-Fixing bugs and adding new features takes a lot of effort.  For a few years
-Bram has attempted to do this next to a full-time job.  During that time the
-todo list kept getting longer and longer.
+Fixing bugs and adding new features takes a lot of time and effort.  To show
+your appreciation for the work and motivate Bram and others to continue
+working on Vim please send a donation.

-In order for Bram to support Vim properly he needs your support.  Through your
-donations Bram will be able to have a part-time job and spend more time on
-fixing bugs and adding new features.
+Since Bram is back to a paid job the money will now be used to help children
+in Uganda.  See |uganda|.  But at the same time donations increase Bram's
+motivation to work on Vim!

 For the most recent information about sponsoring look on the Vim web site:

@@ -58,7 +58,7 @@ But only if you enable this on your account page.

 HOW TO SEND MONEY						*send-money*

-Creditcard	Through PayPal, see the PayPal site for information:
+Credit card	Through PayPal, see the PayPal site for information:
 			https://www.paypal.com
 		The e-mail address for sending sponsorship money is:
 			donate@vim.org
@@ -68,15 +68,7 @@ Creditcard	Through PayPal, see the PayPal site for information:
 		In Euro countries a bank transfer is preferred, this has lower
 		costs.

-Bank transfer	Transfer to Bram's account at the Postbank: 1644503.  For
-		international transfers you can use these numbers:
-			IBAN:       NL79 PSTB 0001 6445 03
-			SWIFT/BIC:  PSTBNL21
-		This is the address of the bank:
-			ING Bank Amsterdam, Foreign Operations
-			PO Box 1800
-			1000 BV Amsterdam
-			The Netherlands
+Other methods	See |iccf-donations|.
 		Include "Vim sponsor" or "Vim registration" in the comment of
 		your money transfer.  Send me an e-mail that mentions the
 		amount you transferred if you want to vote for features and
@@ -88,37 +80,26 @@ Cash		Small amounts can be send with ordinary mail.  Put something
 		features and show others you are a registered Vim user or
 		sponsor.

-This is Bram's address: Bram Moolenaar
-			Clematisstraat 30
-			5925 BE Venlo
+You can use this permanent address:
+			Bram Moolenaar
+			Molenstraat 2
+			2161 HP Lisse
 			The Netherlands


-ALTERNATIVE
-
-If you don't care about sponsoring Vim Development or becoming a registered
-Vim user, but do care about helping needy children, consider giving to the
-ICCF Holland foundation.  This is the charity recommended by Vim's author.
-The money is used for a children centre in the south of Uganda, where AIDS has
-caused many victims.  See |uganda|.
-

 QUESTIONS AND ANSWERS				*sponsor-faq* *register-faq*

 Why should I give money?

-Bram has tried to work on Vim next to a full-time job.  The list of known bugs
-and ideas for new features has constantly been growing during this time.  Bram
-simply can't spend enough time on Vim development when he has a full-time job.
-Your contribution will make it possible for Bram to have a part-time job and
-spend much more time on Vim development.  Bugs will be fixed quicker and new
-Vim releases will become available more often.
+If you do not show your appreciation for Vim then Bram will be less motivated
+to fix bugs and add new features.


 How much money should I send?

-That is up to you.  The more you give, the more time Bram can work on Vim.  An
-indication for individuals that use Vim at home: 10 Euro per year.  For
+That is up to you.  The more you give, the more children will be helped.
+An indication for individuals that use Vim at home: 10 Euro per year.  For
 professional use: 30 Euro per year per person.  Send at least 10 euro to be
 able to vote for features.

@@ -198,33 +179,30 @@ sent money.  The points will be counted right away.

 How about Charityware?

-You have to decide yourself whether you want to sponsor Vim development, help
-the poor children in Uganda (see |uganda|) or both.  Bram will certainly keep
-on supporting the project in Uganda.  In the (unlikely) situation that Bram
-gets more donations for Vim development than he needs, he will send the money
-to Uganda.
+Currently the Vim donations go to |uganda| anyway.  Thus it doesn't matter if
+you sponsor Vim or ICCF.  Except that Vim sponsoring will allow you to vote
+for features.


 I donated $$$, now please add feature XYZ!

 There is no direct relation between your donation and the work Bram does.
-Otherwise you would be paying for work and Bram has to pay income tax over the
+Otherwise you would be paying for work and we would have to pay tax over the
 donation.  If you want to hire Bram for specific work, contact him directly,
 don't use the donation system.


-Are the donations tax deductable?
+Are the donations tax deductible?

-No.  Setting up a system for this is complex and imposes too many restrictions.
-The donations to help the children in |Uganda| are tax deductable in Holland,
-Germany, Canada and probably also in the USA.
+That depends on your country.  The donations to help the children in |Uganda|
+are tax deductible in Holland, Germany, Canada and in the USA.  See the ICCF
+website http://www.iccf.nl/donate.html.  You must send an e-mail to Bram to
+let him know that the donation is done because of the use of Vim.


 Can you send me a bill?

-Sending a bill would mean Bram does something in return for your contribution.
-That is work and would mean Bram has to pay income tax over the amount.  It is
-possible, but the net amount will be lower.
+No.  But a receipt is possible.


 vim:tw=78:ts=8:ft=help:norl:
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -1,4 +1,4 @@
-*tabpage.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 03
+*tabpage.txt*   For Vim version 7.0b.  Last change: 2006 Mar 03


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1609,6 +1609,9 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 31.3	usr_31.txt	/*31.3*
 31.4	usr_31.txt	/*31.4*
 31.5	usr_31.txt	/*31.5*
+32.1	usr_32.txt	/*32.1*
+32.2	usr_32.txt	/*32.2*
+32.3	usr_32.txt	/*32.3*
 40.1	usr_40.txt	/*40.1*
 40.2	usr_40.txt	/*40.2*
 40.3	usr_40.txt	/*40.3*
@@ -5803,6 +5806,7 @@ i`	motion.txt	/*i`*
 ia64.vim	syntax.txt	/*ia64.vim*
 ib	motion.txt	/*ib*
 iccf	uganda.txt	/*iccf*
+iccf-donations	uganda.txt	/*iccf-donations*
 icon-changed	version4.txt	/*icon-changed*
 iconise	starting.txt	/*iconise*
 iconize	starting.txt	/*iconize*
@@ -7352,6 +7356,7 @@ usr_28.txt	usr_28.txt	/*usr_28.txt*
 usr_29.txt	usr_29.txt	/*usr_29.txt*
 usr_30.txt	usr_30.txt	/*usr_30.txt*
 usr_31.txt	usr_31.txt	/*usr_31.txt*
+usr_32.txt	usr_32.txt	/*usr_32.txt*
 usr_40.txt	usr_40.txt	/*usr_40.txt*
 usr_41.txt	usr_41.txt	/*usr_41.txt*
 usr_42.txt	usr_42.txt	/*usr_42.txt*
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 7.0aa.  Last change: 2006 Feb 14
+*term.txt*      For Vim version 7.0b.  Last change: 2006 Feb 14


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/tips.txt
+++ b/runtime/doc/tips.txt
@@ -1,4 +1,4 @@
-*tips.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 01
+*tips.txt*      For Vim version 7.0b.  Last change: 2006 Mar 01


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/uganda.nsis.txt
+++ b/runtime/doc/uganda.nsis.txt
@@ -0,0 +1,292 @@
+    For Vim version 7.0b.  Last change: 2006 Mar 24
+
+		  VIM REFERENCE MANUAL    by Bram Moolenaar
+
+SUMMARY
+
+Vim is Charityware.  You can use and copy it as much as you like, but you are
+encouraged to make a donation for needy children in Uganda.  Please see |kcc|
+below or visit the ICCF web site, available at these URLs:
+
+	http://iccf-holland.org/
+	http://www.vim.org/iccf/
+
+You can also sponsor the development of Vim.  Vim sponsors can vote for
+features.  See |sponsor|.  The money goes to Uganda anyway.
+
+The Open Publication License applies to the Vim documentation, see
+|manual-copyright|.
+
+=== begin of license ===
+
+VIM LICENSE
+
+I)  There are no restrictions on distributing unmodified copies of Vim except
+    that they must include this license text.  You can also distribute
+    unmodified parts of Vim, likewise unrestricted except that they must
+    include this license text.  You are also allowed to include executables
+    that you made from the unmodified Vim sources, plus your own usage
+    examples and Vim scripts.
+
+II) It is allowed to distribute a modified (or extended) version of Vim,
+    including executables and/or source code, when the following four
+    conditions are met:
+    1) This license text must be included unmodified.
+    2) The modified Vim must be distributed in one of the following five ways:
+       a) If you make changes to Vim yourself, you must clearly describe in
+	  the distribution how to contact you.  When the maintainer asks you
+	  (in any way) for a copy of the modified Vim you distributed, you
+	  must make your changes, including source code, available to the
+	  maintainer without fee.  The maintainer reserves the right to
+	  include your changes in the official version of Vim.  What the
+	  maintainer will do with your changes and under what license they
+	  will be distributed is negotiable.  If there has been no negotiation
+	  then this license, or a later version, also applies to your changes.
+	  The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this
+	  changes it will be announced in appropriate places (most likely
+	  vim.sf.net, www.vim.org and/or comp.editors).  When it is completely
+	  impossible to contact the maintainer, the obligation to send him
+	  your changes ceases.  Once the maintainer has confirmed that he has
+	  received your changes they will not have to be sent again.
+       b) If you have received a modified Vim that was distributed as
+	  mentioned under a) you are allowed to further distribute it
+	  unmodified, as mentioned at I).  If you make additional changes the
+	  text under a) applies to those changes.
+       c) Provide all the changes, including source code, with every copy of
+	  the modified Vim you distribute.  This may be done in the form of a
+	  context diff.  You can choose what license to use for new code you
+	  add.  The changes and their license must not restrict others from
+	  making their own changes to the official version of Vim.
+       d) When you have a modified Vim which includes changes as mentioned
+	  under c), you can distribute it without the source code for the
+	  changes if the following three conditions are met:
+	  - The license that applies to the changes permits you to distribute
+	    the changes to the Vim maintainer without fee or restriction, and
+	    permits the Vim maintainer to include the changes in the official
+	    version of Vim without fee or restriction.
+	  - You keep the changes for at least three years after last
+	    distributing the corresponding modified Vim.  When the maintainer
+	    or someone who you distributed the modified Vim to asks you (in
+	    any way) for the changes within this period, you must make them
+	    available to him.
+	  - You clearly describe in the distribution how to contact you.  This
+	    contact information must remain valid for at least three years
+	    after last distributing the corresponding modified Vim, or as long
+	    as possible.
+       e) When the GNU General Public License (GPL) applies to the changes,
+	  you can distribute the modified Vim under the GNU GPL version 2 or
+	  any later version.
+    3) A message must be added, at least in the output of the ":version"
+       command and in the intro screen, such that the user of the modified Vim
+       is able to see that it was modified.  When distributing as mentioned
+       under 2)e) adding the message is only required for as far as this does
+       not conflict with the license used for the changes.
+    4) The contact information as required under 2)a) and 2)d) must not be
+       removed or changed, except that the person himself can make
+       corrections.
+
+III) If you distribute a modified version of Vim, you are encouraged to use
+     the Vim license for your changes and make them available to the
+     maintainer, including the source code.  The preferred way to do this is
+     by e-mail or by uploading the files to a server and e-mailing the URL.
+     If the number of changes is small (e.g., a modified Makefile) e-mailing a
+     context diff will do.  The e-mail address to be used is
+     <maintainer@vim.org>
+
+IV)  It is not allowed to remove this license from the distribution of the Vim
+     sources, parts of it or from a modified version.  You may use this
+     license for previous Vim releases instead of the license that they came
+     with, at your option.
+
+=== end of license ===
+
+Note:
+
+- If you are happy with Vim, please express that by reading the rest of this
+  file and consider helping needy children in Uganda.
+
+- If you want to support further Vim development consider becoming a
+  |sponsor|.  The money goes to Uganda anyway.
+
+- According to Richard Stallman the Vim license is GNU GPL compatible.
+  A few minor changes have been made since he checked it, but that should not
+  make a difference.
+
+- If you link Vim with a library that goes under the GNU GPL, this limits
+  further distribution to the GNU GPL.  Also when you didn't actually change
+  anything in Vim.
+
+- Once a change is included that goes under the GNU GPL, this forces all
+  further changes to also be made under the GNU GPL or a compatible license.
+
+- If you distribute a modified version of Vim, you can include your name and
+  contact information with the "--with-modified-by" configure argument or the
+  MODIFIED_BY define.
+
+==============================================================================
+Kibaale Children's Centre
+
+Kibaale Children's Centre (KCC) is located in Kibaale, a small town in the
+south of Uganda, near Tanzania, in East Africa.  The area is known as Rakai
+District.  The population is mostly farmers.  Although people are poor, there
+is enough food.  But this district is suffering from AIDS more than any other
+part of the world.  Some say that it started there.  Estimations are that 10
+to 30% of the Ugandans are infected with HIV.  Because parents die, there are
+many orphans.  In this district about 60,000 children have lost one or both
+parents, out of a population of 350,000.  And this is still continuing.
+
+The children need a lot of help.  The KCC is working hard to provide the needy
+with food, medical care and education.  Food and medical care to keep them
+healthy now, and education so that they can take care of themselves in the
+future.  KCC works on a Christian base, but help is given to children of any
+religion.
+
+The key to solving the problems in this area is education.  This has been
+neglected in the past years with president Idi Amin and the following civil
+wars.  Now that the government is stable again, the children and parents have
+to learn how to take care of themselves and how to avoid infections.  There is
+also help for people who are ill and hungry, but the primary goal is to
+prevent people from getting ill and to teach them how to grow healthy food.
+
+Most of the orphans are living in an extended family.  An uncle or older
+sister is taking care of them.  Because these families are big and the income
+(if any) is low, a child is lucky if it gets healthy food.  Clothes, medical
+care and schooling is beyond its reach.  To help these needy children, a
+sponsorship program was put into place.  A child can be financially adopted.
+For a few dollars a month KCC sees to it that the child gets indispensable
+items, is healthy, goes to school and KCC takes care of anything else that
+needs to be done for the child and the family that supports it.
+
+Besides helping the child directly, the environment where the child grows up
+needs to be improved.  KCC helps schools to improve their teaching methods.
+There is a demonstration school at the centre and teacher trainings are given.
+Health workers are being trained, hygiene education is carried out and
+households are stimulated to build a proper latrine.  I helped setting up a
+production site for cement slabs.  These are used to build a good latrine.
+They are sold below cost price.
+
+There is a small clinic at the project, which provides children and their
+family with medical help.  When needed, transport to a hospital is offered.
+Immunization programs are carried out and help is provided when an epidemic is
+breaking out (measles and cholera have been a problem).
+
+Summer 1994 to summer 1995 I spent a whole year at the centre, working as a
+volunteer.  I have helped to expand the centre and worked in the area of water
+and sanitation.  I learned that the help that the KCC provides really helps.
+Now that I'm back in Holland, I would like to continue supporting KCC.  To do
+this I'm raising funds and organizing the sponsorship program.  Please
+consider one of these possibilities:
+
+1.  Sponsor a child in primary school: 17 euro a month (or more).
+2.  Sponsor a child in secondary school: 25 euro a month (or more).
+3.  Sponsor the clinic: Any amount a month or quarter
+4.  A one-time donation
+
+Compared with other organizations that do child sponsorship the amounts are
+very low.  This is because the money goes directly to the centre.  Less than
+5% is used for administration.  This is possible because this is a small
+organization that works with volunteers.  If you would like to sponsor a
+child, you should have the intention to do this for at least one year.
+
+How do you know that the money will be spent right?  First of all you have my
+personal guarantee as the author of Vim.  I trust the people that are working
+at the centre, I know them personally.  Further more, the centre is
+co-sponsored and inspected by World Vision, Save the Children Fund and
+International Child Care Fund.  The centre is visited about once a year to
+check the progress (at our own cost).  I have visited the centre myself in
+1996, 1998, 2000, 2001 and 2003.  The visit reports are on the ICCF web site.
+
+If you have any further questions, send me e-mail: <Bram@vim.org>.
+
+The address of the centre is:
+			Kibaale Children's Centre
+			p.o. box 1658
+			Masaka, Uganda, East Africa
+
+Sending money:
+
+Check the ICCF web site for the latest information!  See |iccf| for the URL.
+
+USA:		The methods mentioned below can be used.  Alternatively, you
+		can send a check to the Nehemiah Group Outreach Society
+		(NGOS).  This will reduce banking costs and you can get an IRS
+		tax receipt.  The NGOS forwards the funds directly to the
+		Kibaale project in Uganda.  Checks must be made payable to
+		NGOS but please note on the check "donation Kibaale".  Mail
+		checks to:
+			NGOS
+			P.O. Box 50862
+			Indianapolis, IN 45250
+		Questions regarding the Nehemiah Group Outreach Society (NGOS)
+		should be directed to: Ross deMerchant, Executive Director -
+		r.demerchant AT sbcglobal DOT net.
+		For sponsoring a child contact KCF in Canada (see below) and
+		send the check to NGOS in Indianapolis.
+
+Canada:		Contact Kibaale Children's Fund (KCF) in Surrey, Canada.  They
+		take care of the Canadian sponsors for the children in
+		Kibaale.  KCF forwards 100% of the money to the project in
+		Uganda.  You can send them a one time donation directly.
+		Please send me a note so that I know what has been donated
+		because of Vim.  Ask KCF for information about sponsorship.
+			Kibaale Children's Fund c/o Pacific Academy
+			10238-168 Street
+			Surrey, B.C. V4N 1Z4
+			Canada
+			Phone: 604-581-5353
+		If you make a donation to Kibaale Children's Fund (KCF) you
+		will receive a tax receipt which can be submitted with your
+		tax return.
+
+Holland:	Transfer to the account of "Stichting ICCF Holland" in Venlo.
+		This will allow for tax deduction if you live in Holland.
+			Postbank, nr. 4548774
+
+Germany:	It is possible to make donations that allow for a tax return.
+		Check the ICCF web site for the latest information:
+			http://iccf-holland.org/germany.html
+
+World:		Use a postal money order.  That should be possible from any
+		country, mostly from the post office.  Use this name (which is
+		in my passport): "Abraham Moolenaar".  Use Euro for the
+		currency if possible.
+
+Europe:		Use a bank transfer if possible.  Your bank should have a form
+		that you can use for this.  See "Others" below for the swift
+		code and IBAN number.
+		Any other method should work.  Ask for information about
+		sponsorship.
+
+Credit Card:	You can use PayPal to send money with a Credit card.  This is
+		the most widely used Internet based payment system.  It's
+		really simple to use.  Use this link to find more info:
+		    https://www.paypal.com/affil/pal=Bram%40iccf-holland.org
+		The e-mail address for sending the money to is:
+		    Bram@iccf-holland.org
+		For amounts above 400 Euro ($500) sending a check is
+		preferred.
+
+Others:		Transfer to one of these accounts if possible:
+		    Postbank, account 4548774
+				Swift code: INGB NL 2A
+				IBAN: NL47 PSTB 0004 5487 74
+			under the name "stichting ICCF Holland", Venlo
+		    If that doesn't work:
+		    Rabobank Venlo, account 3765.05.117
+				Swift code: RABO NL 2U
+			under the name "Bram Moolenaar", Venlo
+		Otherwise, send a check in euro or US dollars to the address
+		below.  Minimal amount: $70 (my bank does not accept smaller
+		amounts for foreign check, sorry)
+
+Address to send checks to:
+			stichting ICCF Holland
+			Bram Moolenaar
+			Molenstraat 2
+			2161 HP Lisse
+			The Netherlands
+
+This address is expected to be valid for a long time.  The address in Venlo
+will not be valid after June 2006.
+
+ ts=8:ft=help:norl:
--- a/runtime/doc/uganda.txt
+++ b/runtime/doc/uganda.txt
@@ -1,4 +1,4 @@
-*uganda.txt*    For Vim version 7.0aa.  Last change: 2005 Oct 15
+*uganda.txt*    For Vim version 7.0b.  Last change: 2006 Mar 24


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -15,7 +15,7 @@ below or visit the ICCF web site, available at these URLs:
 	http://www.vim.org/iccf/

 You can also sponsor the development of Vim.  Vim sponsors can vote for
-features.  See |sponsor|.
+features.  See |sponsor|.  The money goes to Uganda anyway.

 The Open Publication License applies to the Vim documentation, see
 |manual-copyright|.
@@ -109,7 +109,7 @@ Note:
  file and consider helping needy children in Uganda.

 - If you want to support further Vim development consider becoming a
-  |sponsor|.
+  |sponsor|.  The money goes to Uganda anyway.

 - According to Richard Stallman the Vim license is GNU GPL compatible.
  A few minor changes have been made since he checked it, but that should not
@@ -206,7 +206,7 @@ The address of the centre is:
 			p.o. box 1658
 			Masaka, Uganda, East Africa

-Sending money:
+Sending money:						*iccf-donations*

 Check the ICCF web site for the latest information!  See |iccf| for the URL.

@@ -286,8 +286,11 @@ Others:		Transfer to one of these accounts if possible:
 Address to send checks to:
 			stichting ICCF Holland
 			Bram Moolenaar
-			Clematisstraat 30
-			5925 BE  Venlo
+			Molenstraat 2
+			2161 HP Lisse
 			The Netherlands

+This address is expected to be valid for a long time.  The address in Venlo
+will not be valid after June 2006.
+
 vim:tw=78:ts=8:ft=help:norl:
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -1,4 +1,4 @@
-*undo.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 21
+*undo.txt*      For Vim version 7.0b.  Last change: 2006 Mar 24


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -113,9 +113,7 @@ branch off.  This happens when you undo a few changes and then make a new
 change.  The undone changes become a branch.  You can go to that branch with
 the following commands.

-What matters here is the order in which the changes are made.  Undo and redo
-are not considered changes in this context.  After each change you have a new
-state of the text.
+This is explained in the user manual: |usr_32.txt|.

 							*:undol* *:undolist*
 :undol[ist]		List the leafs in the tree of changes.  Example:
--- a/runtime/doc/usr_02.txt
+++ b/runtime/doc/usr_02.txt
@@ -1,4 +1,4 @@
-*usr_02.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_02.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24

 		     VIM USER MANUAL - by Bram Moolenaar

@@ -302,7 +302,7 @@ edited.  Typing this command twice cancels the preceding "U".

 The "U" command is a change by itself, which the "u" command undoes and CTRL-R
 redoes.  This might be a bit confusing.  Don't worry, with "u" and CTRL-R you
-can go to any of the situations you had.
+can go to any of the situations you had.  More about that in section ||.

 ==============================================================================
 *02.6*	Other editing commands
--- a/runtime/doc/usr_03.txt
+++ b/runtime/doc/usr_03.txt
@@ -1,4 +1,4 @@
-*usr_03.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 22
+*usr_03.txt*	For Vim version 7.0b.  Last change: 2005 Apr 22

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_08.txt
+++ b/runtime/doc/usr_08.txt
@@ -1,4 +1,4 @@
-*usr_08.txt*	For Vim version 7.0aa.  Last change: 2006 Feb 25
+*usr_08.txt*	For Vim version 7.0b.  Last change: 2006 Feb 25

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_09.txt
+++ b/runtime/doc/usr_09.txt
@@ -1,4 +1,4 @@
-*usr_09.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_09.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_10.txt
+++ b/runtime/doc/usr_10.txt
@@ -1,4 +1,4 @@
-*usr_10.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_10.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_21.txt
+++ b/runtime/doc/usr_21.txt
@@ -1,4 +1,4 @@
-*usr_21.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_21.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_22.txt
+++ b/runtime/doc/usr_22.txt
@@ -1,4 +1,4 @@
-*usr_22.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 10
+*usr_22.txt*	For Vim version 7.0b.  Last change: 2005 Apr 10

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_24.txt
+++ b/runtime/doc/usr_24.txt
@@ -1,4 +1,4 @@
-*usr_24.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_24.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_25.txt
+++ b/runtime/doc/usr_25.txt
@@ -1,4 +1,4 @@
-*usr_25.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_25.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_26.txt
+++ b/runtime/doc/usr_26.txt
@@ -1,4 +1,4 @@
-*usr_26.txt*	For Vim version 7.0aa.  Last change: 2002 Oct 29
+*usr_26.txt*	For Vim version 7.0b.  Last change: 2002 Oct 29

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_29.txt
+++ b/runtime/doc/usr_29.txt
@@ -1,4 +1,4 @@
-*usr_29.txt*	For Vim version 7.0aa.  Last change: 2004 Feb 12
+*usr_29.txt*	For Vim version 7.0b.  Last change: 2004 Feb 12

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_32.txt
+++ b/runtime/doc/usr_32.txt
@@ -0,0 +1,151 @@
+*usr_32.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24
+
+		     VIM USER MANUAL - by Bram Moolenaar
+
+			      The undo tree
+
+
+Vim provides multi-level undo.  If you undo a few changes and then make a new
+change you create a branch in the undo tree.  This text is about moving
+through the branches.
+
+|32.1|	Numbering changes
+|32.2|	Jumping around the tree
+|32.3|	Time travelling
+
+     Next chapter: |usr_40.txt|  Make new commands
+ Previous chapter: |usr_31.txt|  Exploiting the GUI
+Table of contents: |usr_toc.txt|
+
+==============================================================================
+*32.1*	Numbering changes
+
+In section |02.5| we only discussed one line of undo/redo.  But it is also
+possible to branch off.  This happens when you undo a few changes and then
+make a new change.  The new changes become a branch in the undo tree.
+
+Let's start with the text "one".  The first change to make is to append
+" too".  And then move to the first 'o' and change it into 'w'.  We then have
+two changes, numbered 1 and 2, and three states of the text:
+
+		one ~
+		 |
+	      change 1
+	         |
+	      one too ~
+	         |
+	      change 2
+	         |
+	      one two ~
+
+If we now undo one change, back to "one too", and change "one" to "me" we
+create a branch in the undo tree:
+
+		one ~
+		 |
+	      change 1
+	         |
+	      one too ~
+	      /     \
+         change 2  change 3
+            |         |
+         one two    me too ~
+
+You can now use the |u| command to undo.  If you do this twice you get to
+"one".  Use |CTRL-R| to redo, and you will go to "one too".  One more |CTRL-R|
+takes you to "me too".  Thus undo and redo go up and down in the tree, using
+the branch that was last used.
+
+What matters here is the order in which the changes are made.  Undo and redo
+are not considered changes in this context.  After each change you have a new
+state of the text.
+
+Note that only the changes are numbered, the text shown in the tree above has
+no identifier.  They are mostly referred to by the number of the change above
+it.  But sometimes by the number of one of the changes below it, especially
+when moving up in the tree, so that you know which change was just undone.
+
+==============================================================================
+*32.2*	Jumping around the tree
+
+So how do you get to "one two" now?  You can use this command: >
+
+	:undo 2
+
+The text is now "one two", you are below change 2.  You can use the |:undo|
+command to jump to below any change in the tree.
+
+Now make another change: change "one" to "not":
+
+		one ~
+		 |
+	      change 1
+	         |
+	      one too ~
+	      /     \
+         change 2  change 3
+            |         |
+         one two    me too ~
+	    |
+	 change 4
+	    |
+	 not two ~
+
+Now you change your mind and want to go back to "me too".  Use the |g-|
+command.  This moves back in time.  Thus it doesn't walk the tree upwards or
+downwards, but goes to the change made before.
+
+You can repeat |g-| and you will see the text change:
+	me too ~
+	one two ~
+	one too ~
+	one ~
+
+Use |g+| to move forward in time:
+	one ~
+	one too ~
+	one two ~
+	me too ~
+	not two ~
+
+Using |:undo| is useful if you know what change you want to jump to.  |g-| and
+|g+| are useful if you don't know exactly what the change number is.
+
+You can type a count before |g-| and |g+| to repeat them.
+
+==============================================================================
+*32.3*	Time travelling
+
+When you have been working on text for a while the tree grows to become big.
+Then you may want to go to the text of some minutes ago.
+
+To see what branches there are in the undo tree use this command: >
+
+	:undolist
+<	number changes  time ~
+	     3       2  16 seconds ago
+	     4       3  5 seconds ago
+
+Here you can see the number of the leaves in each branch and when the change
+was made.  Assuming we are below change 4, at "not two", you can go back ten
+seconds with this command: >
+
+	:earlier 10s
+
+Depending on how much time you took for the changes you end up at a certain
+position in the tree.  The |:earlier| command argument can be "m" for minutes
+and "h" for hours.  To go all the way back use a big number: >
+
+	:earlier 10h
+
+To travel forward in time again use the |:later| command: >
+
+	:later 1m
+
+The arguments are "s", "m" and "h", just like with |:earlier|.
+
+==============================================================================
+
+Next chapter: |usr_40.txt|  Make new commands
+
+Copyright: see |manual-copyright|  vim:tw=78:ts=8:ft=help:norl:
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 7.0aa.  Last change: 2006 Mar 21
+*usr_41.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24

 		     VIM USER MANUAL - by Bram Moolenaar

@@ -2293,6 +2293,8 @@ utility is recommended.
 For utmost portability use Vim itself to pack scripts together.  This can be
 done with the Vimball utility.  See |vimball|.

+It's good if you add a line to allow automatic updating.  See |glvs-plugins|.
+
 ==============================================================================

 Next chapter: |usr_42.txt|  Add new menus
--- a/runtime/doc/usr_42.txt
+++ b/runtime/doc/usr_42.txt
@@ -1,4 +1,4 @@
-*usr_42.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_42.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_43.txt
+++ b/runtime/doc/usr_43.txt
@@ -1,4 +1,4 @@
-*usr_43.txt*	For Vim version 7.0aa.  Last change: 2002 Jul 14
+*usr_43.txt*	For Vim version 7.0b.  Last change: 2002 Jul 14

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_44.txt
+++ b/runtime/doc/usr_44.txt
@@ -1,4 +1,4 @@
-*usr_44.txt*	For Vim version 7.0aa.  Last change: 2005 Apr 01
+*usr_44.txt*	For Vim version 7.0b.  Last change: 2005 Apr 01

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_45.txt
+++ b/runtime/doc/usr_45.txt
@@ -1,4 +1,4 @@
-*usr_45.txt*	For Vim version 7.0aa.  Last change: 2004 Jun 08
+*usr_45.txt*	For Vim version 7.0b.  Last change: 2004 Jun 08

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_90.txt
+++ b/runtime/doc/usr_90.txt
@@ -1,4 +1,4 @@
-*usr_90.txt*	For Vim version 7.0aa.  Last change: 2004 Mar 21
+*usr_90.txt*	For Vim version 7.0b.  Last change: 2004 Mar 21

 		     VIM USER MANUAL - by Bram Moolenaar

--- a/runtime/doc/usr_toc.txt
+++ b/runtime/doc/usr_toc.txt
@@ -1,4 +1,4 @@
-*usr_toc.txt*	For Vim version 7.0aa.  Last change: 2006 Mar 21
+*usr_toc.txt*	For Vim version 7.0b.  Last change: 2006 Mar 24

 		     VIM USER MANUAL - by Bram Moolenaar

@@ -34,6 +34,7 @@ Editing Effectively
 |usr_29.txt|  Moving through programs
 |usr_30.txt|  Editing programs
 |usr_31.txt|  Exploiting the GUI
+|usr_32.txt|  The undo tree

 Tuning Vim
 |usr_40.txt|  Make new commands
@@ -47,7 +48,8 @@ Making Vim Run
 |usr_90.txt|  Installing Vim


-More detailed information in the reference manual: |ref-toc|
+Reference manual
+|ref-toc|     More detailed information for all commands

 The user manual is available as a single, ready to print HTML and PDF file
 here:
@@ -270,6 +272,11 @@ Subjects that can be read independently.
 		|31.4|	Vim window position and size
 		|31.5|	Various

+|usr_32.txt|  The undo tree
+		|32.1|	Numbering changes
+		|32.2|	Jumping around the tree
+		|32.3|	Time travelling
+
 ==============================================================================
 Tuning Vim ~

--- a/runtime/doc/version4.txt
+++ b/runtime/doc/version4.txt
@@ -1,4 +1,4 @@
-*version4.txt*  For Vim version 7.0aa.  Last change: 2004 Mar 12
+*version4.txt*  For Vim version 7.0b.  Last change: 2004 Mar 12


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/version5.txt
+++ b/runtime/doc/version5.txt
@@ -1,4 +1,4 @@
-*version5.txt*  For Vim version 7.0aa.  Last change: 2005 Apr 01
+*version5.txt*  For Vim version 7.0b.  Last change: 2005 Apr 01


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/version6.txt
+++ b/runtime/doc/version6.txt
@@ -1,4 +1,4 @@
-*version6.txt*  For Vim version 7.0aa.  Last change: 2005 Oct 17
+*version6.txt*  For Vim version 7.0b.  Last change: 2005 Oct 17


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -1,4 +1,4 @@
-*vi_diff.txt*   For Vim version 7.0aa.  Last change: 2006 Jan 02
+*vi_diff.txt*   For Vim version 7.0b.  Last change: 2006 Jan 02


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -1,4 +1,4 @@
-*visual.txt*    For Vim version 7.0aa.  Last change: 2006 Mar 20
+*visual.txt*    For Vim version 7.0b.  Last change: 2006 Mar 20


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- a/runtime/ftplugin/plaintex.vim
+++ b/runtime/ftplugin/plaintex.vim
@@ -0,0 +1,48 @@
+" plain TeX filetype plugin
+" Language:     plain TeX (ft=plaintex)
+" Maintainer:   Benji Fisher, Ph.D. <benji@member.AMS.org>
+" Version:	1.0
+" Last Change:	Wed 22 Mar 2006 09:36:32 AM EST
+
+" Only do this when not done yet for this buffer.
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer.
+let b:did_ftplugin = 1
+
+" Avoid problems if running in 'compatible' mode.
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Set 'comments' to format dashed lists in comments
+setlocal com=sO:%\ -,mO:%\ \ ,eO:%%,:%
+
+" Set 'commentstring' to recognize the % comment character:
+" (Thanks to Ajit Thakkar.)
+setlocal cms=%%s
+
+" Allow "[d" to be used to find a macro definition:
+let &l:define='\\\([egx]\|char\|mathchar\|count\|dimen\|muskip\|skip\|toks\)\='
+	\ .	'def\|\\font\|\\\(future\)\=let'
+	\ . '\|\\new\(count\|dimen\|skip\|muskip\|box\|toks\|read\|write'
+	\ .	'\|fam\|insert\)'
+
+" Tell Vim to recognize \input bar :
+let &l:include = '\\input'
+setlocal suffixesadd=.tex
+
+" The following lines enable the macros/matchit.vim plugin for
+" extended matching with the % key.
+" There is no default meaning for \(...\) etc., but many users define one.
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+    \ | let b:match_skip = 'r:\\\@<!\%(\\\\\)*%'
+    \ | let b:match_words = '(:),\[:],{:},\\(:\\),\\\[:\\],' .
+    \ '\\begin\s*\({\a\+\*\=}\):\\end\s*\1'
+endif " exists("loaded_matchit")
+
+let &cpo = s:save_cpo
+
+" vim:sts=2:sw=2:
--- a/runtime/ftplugin/tex.vim
+++ b/runtime/ftplugin/tex.vim
@@ -1,110 +1,41 @@
 " LaTeX filetype plugin
 " Language:     LaTeX (ft=tex)
 " Maintainer:   Benji Fisher, Ph.D. <benji@member.AMS.org>
-" Version:	1.2
-" Last Change:	Tue 11 May 2004 04:49:20 PM EDT
+" Version:	1.3
+" Last Change:	Wed 22 Mar 2006 09:36:32 AM EST
 "  URL:		http://www.vim.org/script.php?script_id=411

-" Only do this when not done yet for this buffer
+" Only do this when not done yet for this buffer.
 if exists("b:did_ftplugin")
  finish
 endif

-" Don't load another plugin for this buffer
-let b:did_ftplugin = 1
+" Start with plain TeX.  This will also define b:did_ftplugin .
+source $VIMRUNTIME/ftplugin/plaintex.vim

+" Avoid problems if running in 'compatible' mode.
 let s:save_cpo = &cpo
 set cpo&vim

-" This may be used to set b:tex_flavor.  A more complete version can be found
-" in foo.vim (see http://www.vim.org/script.php?script_id=72).
-if !exists("*s:GetModelines")
-  fun! s:GetModelines(pat, ...)
-    " Long but simple:  set start line and finish line.
-    let EOF = line("$")
-    if a:0 > 1
-      let start = a:1 | let finish = a:2
-    elseif a:0 == 1
-      if a:1 > 0
-	let finish = a:1
-      else
-	let start = EOF + a:1 + 1
-      endif
-    endif
-    if !exists("start") || start < 1
-      let start = 1
-    endif
-    if !exists("finish") || finish > EOF
-      let finish = EOF
-    endif
-    let n = 0
-    silent! execute start .",". finish
-	  \ 'g/' . escape(a:pat, "/") . "/let n=line('.')"
-    if n
-      execute "normal!\<C-O>"
-    endif
-    return n . ":"
-  endfun
-endif " !exists("*GetModelines")
-
-" Define the buffer-local variable b:tex_flavor to "tex" (for plain) or
-" "latex".
-" 1. Check the first line of the file for "%&<format>".
-" 2. Check the first 1000 lines for "\begin{document}".
-" 3. Check for a global variable g:tex_flavor, can be set in user's vimrc.
-" 4. Default to "latex".
-" 5. Strip "pdf" and change "plain" to "tex".
-if getline(1) =~ '^%&\s*\k\+'
-	let b:tex_flavor = matchstr(getline(1), '%&\s*\zs\k\+')
-elseif s:GetModelines('\\begin\s*{\s*document\s*}', 1000) != "0:"
-	let b:tex_flavor = "latex"
-elseif exists("g:tex_flavor")
-	let b:tex_flavor = g:tex_flavor
-else
-	let b:tex_flavor = "latex"
-endif
-let b:tex_flavor = substitute(b:tex_flavor, 'pdf', '', '')
-if b:tex_flavor == "plain"
-	let b:tex_flavor = "tex"
-endif
-
-" Set 'comments' to format dashed lists in comments
-setlocal com=sO:%\ -,mO:%\ \ ,eO:%%,:%
-
-" Set 'commentstring' to recognize the % comment character:
-" (Thanks to Ajit Thakkar.)
-setlocal cms=%%s
-
 " Allow "[d" to be used to find a macro definition:
 " Recognize plain TeX \def as well as LaTeX \newcommand and \renewcommand .
 " I may as well add the AMS-LaTeX DeclareMathOperator as well.
-let &l:define='\\\([egx]\|char\|mathchar\|count\|dimen\|muskip\|skip\|toks\)\='
-	\ .	'def\|\\font\|\\\(future\)\=let'
-	\ . '\|\\new\(count\|dimen\|skip\|muskip\|box\|toks\|read\|write'
-	\ .	'\|fam\|insert\)'
-	\ . '\|\\\(re\)\=new\(boolean\|command\|counter\|environment\|font'
+let &l:define .= '\|\\\(re\)\=new\(boolean\|command\|counter\|environment\|font'
 	\ . '\|if\|length\|savebox\|theorem\(style\)\=\)\s*\*\=\s*{\='
 	\ . '\|DeclareMathOperator\s*{\=\s*'

 " Tell Vim how to recognize LaTeX \include{foo} and plain \input bar :
-setlocal include=\\\\input\\\\|\\\\include{
-setlocal suffixesadd=.tex
+let &l:include .= '\|\\include{'
 " On some file systems, "{" and "}" are inluded in 'isfname'.  In case the
 " TeX file has \include{fname} (LaTeX only), strip everything except "fname".
 let &l:includeexpr = "substitute(v:fname, '^.\\{-}{\\|}.*', '', 'g')"
-" fun! TexIncludeExpr()
-"   let fname = substitute(v:fname, '}.*', '', '')
-"   return fname
-" endfun

 " The following lines enable the macros/matchit.vim plugin for
 " extended matching with the % key.
-" TODO:  Customize this based on b:tex_flavor .
+" ftplugin/plaintex.vim already defines b:match_skip and b:match_ignorecase
+" and matches \(, \), \[, and \].
 if exists("loaded_matchit")
-  let b:match_ignorecase = 0
-    \ | let b:match_skip = 'r:\\\@<!\%(\\\\\)*%'
-    \ | let b:match_words = '(:),\[:],{:},\\(:\\),\\\[:\\],' .
-    \ '\\begin\s*\({\a\+\*\=}\):\\end\s*\1'
+  let b:match_words .= '\\begin\s*\({\a\+\*\=}\):\\end\s*\1'
 endif " exists("loaded_matchit")

 let &cpo = s:save_cpo
--- a/runtime/keymap/greek_utf-8.vim
+++ b/runtime/keymap/greek_utf-8.vim
@@ -1,5 +1,9 @@
-" This file was adapted for Vim 6 from the yudit distribution by
-" Robert Goulding <goulding@princeton.edu>
+" Vim Keymap file for greek
+" Maintainer: Panagiotis Louridas <louridas@acm.org>
+" Last Updated: Thu Mar 23 23:45:02 EET 2006
+
+" This file was corrected for Vim after the version adapted for Vim 6 from 
+" the yudit distribution by Robert Goulding <goulding@princeton.edu>
 "
 " The monotonic part of this kmap was made by Constantine Stathopoulos
 " <cstath@irismedia.gr>.
@@ -7,8 +11,7 @@
 " Aarhus, Denmark.
 " It was modified and completed by A. Tsolomitis <atsol@aegean.gr>
 " The licence allows modifications but redistribution of modifications
-" should be with an other name.
-" Any comments can be sent to A. Tsolomitis <atsol@aegean.gr>
+" should be with another name.

 " The keymap now conforms with the
 " LaTeX's-Babel Standard by A. Syropoulos <apostolo@ocean1.ee.duth.gr>
@@ -38,7 +41,8 @@

 " > dasia " an oxia or baria *always* should follow dasia
 " < psili " an oxia or baria *always* should follow psili
-" ; oxia
+" ; tonos
+" / oxia
 " ` varia
 " ~ perispomeni
 " : dialytika
@@ -95,18 +99,19 @@ W	<char-0x0387>   " GREEK ANO TELEIA (Emacs standard)
 ;:	<char-0x0385>	" GREEK DIALYTIKA Oxia
 :`	<char-0x1FED>	" GREEK DIALYTIKA VARIA
 `:	<char-0x1FED>	" GREEK DIALYTIKA VARIA
-`	<char-0x1FEF>   " Greek Varia
-~	<char-0x1FC0>   " Perispomeni
->`	<char-0x1FCD>	" Psili Varia
-<`	<char-0x1FDD>	" Dasia Varia
->;	<char-0x1FCE>	" Psili Oxia
-<;	<char-0x1FDE>	" Dasia Oxia
-<~	<char-0x1FDF>	" Dasia Perispomeni
->~	<char-0x1FCF>	" Psili Perispomeni
+/	<char-0x1FFD>	" GREEK OXIA
+`	<char-0x1FEF>   " GREEK VARIA
+~	<char-0x1FC0>   " PERISPOMENI
+>`	<char-0x1FCD>	" PSILI VARIA
+<`	<char-0x1FDD>	" DASIA VARIA
+>;	<char-0x1FCE>	" PSILI OXIA
+<;	<char-0x1FDE>	" DASIA OXIA
+<~	<char-0x1FDF>	" DASIA PERISPOMENI
+>~	<char-0x1FCF>	" PSILI PERISPOMENI
 "For plain psili use apostrophe
 ;'	<char-0x1FFE>	" (Plain) dasia
-
-
+"
+"
 "
 " GREEK LETTERS
 "
@@ -127,8 +132,6 @@ J	<char-0x039E>   " GREEK CAPITAL LETTER XI
 O	<char-0x039F>   " GREEK CAPITAL LETTER OMIKRON
 P	<char-0x03A0>   " GREEK CAPITAL LETTER PI
 R	<char-0x03A1>   " GREEK CAPITAL LETTER RHO
-"W	<char-0x03A3>   " GREEK CAPITAL LETTER SIGMA [CAPITAL ANALOGUE FOR
-			" SMALL LETTER FINAL SIGMA]
 S	<char-0x03A3>   " GREEK CAPITAL LETTER SIGMA
 T	<char-0x03A4>   " GREEK CAPITAL LETTER TAU
 Y	<char-0x03A5>   " GREEK CAPITAL LETTER UPSILON
@@ -191,8 +194,9 @@ v	<char-0x03C9>   " GREEK SMALL LETTER OMEGA
 ;y	<char-0x03CD>  " GREEK SMALL LETTER UPSILON WITH TONOS
 ;v	<char-0x03CE>  " GREEK SMALL LETTER OMEGA WITH TONOS

-
-
+"
+" This area covers 0x1F00-0x1FFF
+"
 "
 " letters with Varia:
 "
@@ -213,23 +217,20 @@ v	<char-0x03C9>   " GREEK SMALL LETTER OMEGA
 "
 " letters with Oxia:
 "
-;A	<char-0x1FBB>  " GREEK CAPITAL LETTER ALPHA WITH OXIA
-;E	<char-0x1FC9>  " GREEK CAPITAL LETTER EPSILON WITH OXIA
-;H	<char-0x1FCB>  " GREEK CAPITAL LETTER ETA WITH OXIA
-;I	<char-0x1FDB>  " GREEK CAPITAL LETTER IOTA WITH OXIA
-;O	<char-0x1FF9>  " GREEK CAPITAL LETTER OMICRON WITH OXIA
-;Y	<char-0x1FEB>  " GREEK CAPITAL LETTER UPSILON WITH OXIA
-;V	<char-0x1FFB>  " GREEK CAPITAL LETTER OMEGA WITH OXIA
-;a	<char-0x1F71>  " GREEK SMALL LETTER ALPHA WITH OXIA
-;e	<char-0x1F73>  " GREEK SMALL LETTER EPSILON WITH OXIA
-;h	<char-0x1F75>  " GREEK SMALL LETTER ETA WITH OXIA
-;i	<char-0x1F77>  " GREEK SMALL LETTER IOTA WITH OXIA
-;o	<char-0x1F79>  " GREEK SMALL LETTER OMICRON WITH OXIA
-;y	<char-0x1F7B>  " GREEK SMALL LETTER UPSILON WITH OXIA
-;v	<char-0x1F7D>  " GREEK SMALL LETTER OMEGA WITH OXIA
-"
-"
-" This area covers 0x1F00-0x1F6F
+/A	<char-0x1FBB>  " GREEK CAPITAL LETTER ALPHA WITH OXIA
+/E	<char-0x1FC9>  " GREEK CAPITAL LETTER EPSILON WITH OXIA
+/H	<char-0x1FCB>  " GREEK CAPITAL LETTER ETA WITH OXIA
+/I	<char-0x1FDB>  " GREEK CAPITAL LETTER IOTA WITH OXIA
+/O	<char-0x1FF9>  " GREEK CAPITAL LETTER OMICRON WITH OXIA
+/Y	<char-0x1FEB>  " GREEK CAPITAL LETTER UPSILON WITH OXIA
+/V	<char-0x1FFB>  " GREEK CAPITAL LETTER OMEGA WITH OXIA
+/a	<char-0x1F71>  " GREEK SMALL LETTER ALPHA WITH OXIA
+/e	<char-0x1F73>  " GREEK SMALL LETTER EPSILON WITH OXIA
+/h	<char-0x1F75>  " GREEK SMALL LETTER ETA WITH OXIA
+/i	<char-0x1F77>  " GREEK SMALL LETTER IOTA WITH OXIA
+/o	<char-0x1F79>  " GREEK SMALL LETTER OMICRON WITH OXIA
+/y	<char-0x1F7B>  " GREEK SMALL LETTER UPSILON WITH OXIA
+/v	<char-0x1F7D>  " GREEK SMALL LETTER OMEGA WITH OXIA
 "
 " letters with Psili:
 "
@@ -380,7 +381,6 @@ h|	<char-0x1FC3>  " GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
 v|	<char-0x1FF3>  " GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
 "
 "
-" This area covers 0x1F80-0x1FAF
 "
 " letters with Psili and Ypogegrammeni/Prosgegrammeni:
 "
@@ -393,6 +393,8 @@ v|	<char-0x1FF3>  " GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
 >h|	<char-0x1F90>  " GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
 >v|	<char-0x1FA0>  " GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
 "
+"
+"
 " letters with Dasia and Ypogegrammeni/Prosgegrammeni:
 "
 <A|	<char-0x1F89>  " GREEK CAPITAL LETTER ALPHA WITH DASIA AND
@@ -404,6 +406,8 @@ v|	<char-0x1FF3>  " GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
 <h|	<char-0x1F91>  " GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
 <v|	<char-0x1FA1>  " GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
 "
+"
+"
 " letters with Psili and Varia and Ypogegrammeni/Prosgegrammeni:
 "
 >`A|	<char-0x1F8A>  " GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND
@@ -419,6 +423,8 @@ v|	<char-0x1FF3>  " GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
 >`v|	<char-0x1FA2>  " GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND
 		       " YPOGEGRAMMENI
 "
+"
+"
 " letters with Dasia and Varia and Ypogegrammeni/Prosgegrammeni:
 "
 <`A|	<char-0x1F8B>  " GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND
@@ -436,6 +442,8 @@ v|	<char-0x1FF3>  " GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
 "
 " letters with Psili and Oxia and Ypogegrammeni/Prosgegrammeni:
 "
+"
+"
 >;A|	<char-0x1F8C>  " GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND
 		       " PROSGEGRAMMENI
 >;H|	<char-0x1F9C>  " GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND
@@ -451,6 +459,8 @@ v|	<char-0x1FF3>  " GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
 "
 " letters with Dasia and Oxia and Ypogegrammeni/Prosgegrammeni:
 "
+"
+"
 <;A|	<char-0x1F8D>  " GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND
 		       " PROSGEGRAMMENI
 <;H|	<char-0x1F9D>  " GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND
@@ -466,6 +476,8 @@ v|	<char-0x1FF3>  " GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
 "
 " letters with Psili and Perispomeni and Ypogegrammeni/Prosgegrammeni:
 "
+"
+"
 >~A|	<char-0x1F8E>  " GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
 		       " AND PROSGEGRAMMENI
 >~H|	<char-0x1F9E>  " GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
@@ -481,6 +493,8 @@ v|	<char-0x1FF3>  " GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
 "
 " letters with Dasia and Perispomeni and Ypogegrammeni/Prosgegrammeni:
 "
+"
+"
 <~A|	<char-0x1F8F>  " GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
 		       " AND PROSGEGRAMMENI
 <~H|	<char-0x1F9F>  " GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
@@ -496,6 +510,8 @@ v|	<char-0x1FF3>  " GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
 "
 " letters with Perispomeni:
 "
+"
+"
 ~a	<char-0x1FB6>  " GREEK SMALL LETTER ALPHA WITH PERISPOMENI
 ~h	<char-0x1FC6>  " GREEK SMALL LETTER ETA WITH PERISPOMENI
 ~i	<char-0x1FD6>  " GREEK SMALL LETTER IOTA WITH PERISPOMENI
@@ -504,6 +520,8 @@ v|	<char-0x1FF3>  " GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
 "
 " letters with Perispomeni and Ypogegrammeni:
 "
+"
+"
 ~a|	<char-0x1FB7> " GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND
 		      " YPOGEGRAMMENI
 ~h|	<char-0x1FC7> " GREEK SMALL LETTER ETA WITH PERISPOMENI AND
@@ -514,12 +532,16 @@ v|	<char-0x1FF3>  " GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
 "
 " letters with Varia and Ypogegrammeni:
 "
+"
+"
 `a|	<char-0x1FB2>  " GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
 `h|	<char-0x1FC2>  " GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
 `v|	<char-0x1FF2>  " GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
 "
 " letters with Oxia and Ypogegrammeni:
 "
+"
+"
 ;a|	<char-0x1FB4>  " GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
 ;h|	<char-0x1FC4>  " GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
 ;v|	<char-0x1FF4>  " GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
--- a/runtime/macros/matchit.txt
+++ b/runtime/macros/matchit.txt
@@ -4,7 +4,7 @@ For instructions on installing this file, type
 	:help matchit-install
 inside Vim.

-For Vim version 6.3.  Last change:  2004 May 12
+For Vim version 6.3.  Last change:  2006 Feb 23


 		  VIM REFERENCE MANUAL    by Benji Fisher
@@ -247,7 +247,7 @@ Examples:
 	comment character) you can >
 		:let b:match_skip = 'r:\(^\|[^\\]\)\(\\\\\)*%'
 <
-	See the $VIMRUNTIME/syntax/vim.vim for an example that uses both
+	See the $VIMRUNTIME/ftplugin/vim.vim for an example that uses both
 	syntax and a regular expression.

 ==============================================================================
@@ -261,8 +261,10 @@ Vim's |regular-expression|s.

 The format for |b:match_words| is similar to that of the 'matchpairs' option:
 it is a comma (,)-separated list of groups; each group is a colon(:)-separated
-list of patterns (regular expressions).  It is OK to have only one group; the
-effect is undefined if a group has only one pattern.  A simple example is >
+list of patterns (regular expressions).  Commas and backslashes that are part
+of a pattern should be escaped with backslashes ('\:' and '\,').  It is OK to
+have only one group; the effect is undefined if a group has only one pattern.
+A simple example is >
 	:let b:match_words = '\<if\>:\<endif\>,'
 		\ . '\<while\>:\<continue\>:\<break\>:\<endwhile\>'
 (In Vim regular expressions, |\<| and |\>| denote word boundaries.  Thus "if"
--- a/runtime/makemenu.vim
+++ b/runtime/makemenu.vim
@@ -1,6 +1,6 @@
 " Script to define the syntax menu in synmenu.vim
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2006 Mar 23
+" Last Change:	2006 Mar 24

 " This is used by "make menu" in the src directory.
 edit <sfile>:p:h/synmenu.vim
@@ -48,6 +48,7 @@ fun! <SID>Syn(arg)
  let s:lnum = s:lnum + 1
 endfun

+SynMenu AB.A2ps\ config:a2ps
 SynMenu AB.Aap:aap
 SynMenu AB.ABAP/4:abap
 SynMenu AB.Abaqus:abaqus
@@ -83,6 +84,8 @@ SynMenu AB.Assembly.VAX\ Macro\ Assembly:vmasm
 SynMenu AB.Assembly.Z-80:z8a
 SynMenu AB.Assembly.xa\ 6502\ cross\ assember:a65
 SynMenu AB.ASN\.1:asn
+SynMenu AB.Asterisk\ config:asterisk
+SynMenu AB.Asterisk\ voicemail\ config:asteriskvm
 SynMenu AB.Atlas:atlas
 SynMenu AB.Automake:automake
 SynMenu AB.Avenue:ave
@@ -120,6 +123,7 @@ SynMenu C.Cold\ Fusion:cf
 SynMenu C.Config.Cfg\ Config\ file:cfg
 SynMenu C.Config.Generic\ Config\ file:conf
 SynMenu C.Config.Configure\.in:config
+SynMenu C.ConTeXt:context
 SynMenu C.CRM114:crm
 SynMenu C.Ctrl-H:ctrlh
 SynMenu C.Cobol:cobol
@@ -133,6 +137,8 @@ SynMenu DE.D:d
 SynMenu DE.Debian.Debian\ ChangeLog:debchangelog
 SynMenu DE.Debian.Debian\ Control:debcontrol
 SynMenu DE.Desktop:desktop
+SynMenu DE.Dict\ config:dictconf
+SynMenu DE.Dictd\ config:dictdconf
 SynMenu DE.Diff:diff
 SynMenu DE.Digital\ Command\ Lang:dcl
 SynMenu DE.Dircolors:dircolors
@@ -161,6 +167,7 @@ SynMenu DE.ESQL-C:esqlc
 SynMenu DE.Essbase\ script:csc
 SynMenu DE.Esterel:esterel
 SynMenu DE.Eterm\ config:eterm
+SynMenu DE.Eviews:eviews
 SynMenu DE.Exim\ conf:exim
 SynMenu DE.Expect:expect
 SynMenu DE.Exports:exports
@@ -183,6 +190,7 @@ SynMenu FG.Gedcom:gedcom
 SynMenu FG.Gkrellmrc:gkrellmrc
 SynMenu FG.GP:gp
 SynMenu FG.GPG:gpg
+SynMenu FG.Group\ file:group
 SynMenu FG.Grub:grub
 SynMenu FG.GNU\ Server\ Pages:gsp
 SynMenu FG.GNUplot:gnuplot
@@ -235,15 +243,19 @@ SynMenu HIJK.KixTart:kix
 SynMenu L-Ma.Lace:lace
 SynMenu L-Ma.LamdaProlog:lprolog
 SynMenu L-Ma.Latte:latte
+SynMenu L-Ma.Ld\ script:ld
 SynMenu L-Ma.LDAP\ LDIF:ldif
 SynMenu L-Ma.Lex:lex
 SynMenu L-Ma.LFTP\ config:lftp
 SynMenu L-Ma.Libao:libao
 SynMenu L-Ma.LifeLines\ script:lifelines
 SynMenu L-Ma.Lilo:lilo
+SynMenu L-Ma.Limits\ config:limits
 SynMenu L-Ma.Lisp:lisp
 SynMenu L-Ma.Lite:lite
 SynMenu L-Ma.Locale\ Input:fdcc
+SynMenu L-Ma.Login\.access:loginaccess
+SynMenu L-Ma.Login\.defs:logindefs
 SynMenu L-Ma.Logtalk:logtalk
 SynMenu L-Ma.LOTOS:lotos
 SynMenu L-Ma.LotusScript:lscript
@@ -259,6 +271,7 @@ SynMenu L-Ma.Mailcap:mailcap
 SynMenu L-Ma.Makefile:make
 SynMenu L-Ma.MakeIndex:ist
 SynMenu L-Ma.Man\ page:man
+SynMenu L-Ma.Man\.conf:manconf
 SynMenu L-Ma.Maple\ V:maple
 SynMenu L-Ma.Mason:mason
 SynMenu L-Ma.Mathematica:mma
@@ -267,6 +280,7 @@ SynMenu L-Ma.Matlab:matlab
 SynMenu Me-NO.MEL\ (for\ Maya):mel
 SynMenu Me-NO.Metafont:mf
 SynMenu Me-NO.MetaPost:mp
+SynMenu Me-NO.MGL:mgl
 SynMenu Me-NO.MMIX:mmix
 SynMenu Me-NO.Modconf:modconf
 SynMenu Me-NO.Model:model
@@ -283,8 +297,10 @@ SynMenu Me-NO.MS-DOS/Windows.Module\ Definition:def
 SynMenu Me-NO.MS-DOS/Windows.Registry:registry
 SynMenu Me-NO.MS-DOS/Windows.Resource\ file:rc
 SynMenu Me-NO.Msql:msql
+SynMenu Me-NO.MuPAD:mupad
 SynMenu Me-NO.MUSHcode:mush
 SynMenu Me-NO.Muttrc:muttrc
+SynMenu Me-NO.Nanorc:nanorc
 SynMenu Me-NO.Nastran\ input/DMAP:nastran
 SynMenu Me-NO.Natural:natural
 SynMenu Me-NO.Netrc:netrc
@@ -301,10 +317,12 @@ SynMenu Me-NO.OpenROAD:openroad
 SynMenu Me-NO.Open\ Psion\ Lang:opl
 SynMenu Me-NO.Oracle\ config:ora

-SynMenu PQ.Palm\ resource\ compiler:pilrc
 SynMenu PQ.Packet\ filter\ conf:pf
+SynMenu PQ.Palm\ resource\ compiler:pilrc
+SynMenu PQ.Pam\ config:pamconf
 SynMenu PQ.PApp:papp
 SynMenu PQ.Pascal:pascal
+SynMenu PQ.Password\ file:passwd
 SynMenu PQ.PCCTS:pccts
 SynMenu PQ.PPWizard:ppwiz
 SynMenu PQ.Perl.Perl:perl
@@ -330,6 +348,7 @@ SynMenu PQ.Procmail:procmail
 SynMenu PQ.Product\ Spec\ File:psf
 SynMenu PQ.Progress:progress
 SynMenu PQ.Prolog:prolog
+SynMenu PQ.Protocols:protocols
 SynMenu PQ.Purify\ log:purifylog
 SynMenu PQ.Pyrex:pyrex
 SynMenu PQ.Python:python
@@ -337,6 +356,8 @@ SynMenu PQ.Quake:quake
 SynMenu PQ.Quickfix\ window:qf

 SynMenu R-Sg.R:r
+SynMenu R-Sg.R\ help:rhelp
+SynMenu R-Sg.Racc\ input:racc
 SynMenu R-Sg.Radiance:radiance
 SynMenu R-Sg.Ratpoison:ratpoison
 SynMenu R-Sg.RCS.RCS\ log\ output:rcslog
@@ -367,6 +388,12 @@ SynMenu R-Sg.SDL:sdl
 SynMenu R-Sg.Sed:sed
 SynMenu R-Sg.Sendmail\.cf:sm
 SynMenu R-Sg.Send-pr:sendpr
+SynMenu R-Sg.Sensors\.conf:sensors
+SynMenu R-Sg.Service\ Location\ config:slpconf
+SynMenu R-Sg.Service\ Location\ registration:slpreg
+SynMenu R-Sg.Service\ Location\ SPI:slpspi
+SynMenu R-Sg.Services:services
+SynMenu R-Sg.Setserial\ config:setserial
 SynMenu R-Sg.SGML.SGML\ catalog:catalog
 SynMenu R-Sg.SGML.SGML\ DTD:sgml
 SynMenu R-Sg.SGML.SGML\ Declaration:sgmldecl
@@ -407,7 +434,9 @@ SynMenu Sh-S.Squid\ config:squid
 SynMenu Sh-S.SQL.ESQL-C:esqlc
 SynMenu Sh-S.SQL.MySQL:mysql
 SynMenu Sh-S.SQL.PL/SQL:plsql
-SynMenu Sh-S.SQL.SQL\ (Oracle):sql
+SynMenu Sh-S.SQL.SQL\ Anywhere:sqlanywhere
+SynMenu Sh-S.SQL.SQL\ (automatic):sql
+SynMenu Sh-S.SQL.SQL\ (Oracle):sqloracle
 SynMenu Sh-S.SQL.SQL\ Forms:sqlforms
 SynMenu Sh-S.SQL.SQLJ:sqlj
 SynMenu Sh-S.SQL.SQL-Informix:sqlinformix
@@ -419,6 +448,7 @@ SynMenu Sh-S.Stored\ Procedures:stp
 SynMenu Sh-S.Strace:strace
 SynMenu Sh-S.Subversion\ commit:svn
 SynMenu Sh-S.Sudoers:sudoers
+SynMenu Sh-S.Sysctl\.conf:sysctl

 SynMenu TUV.TADS:tads
 SynMenu TUV.Tags:tags
@@ -438,11 +468,16 @@ SynMenu TUV.Tidy\ configuration:tidy
 SynMenu TUV.Tilde:tilde
 SynMenu TUV.TPP:tpp
 SynMenu TUV.Trasys\ input:trasys
+SynMenu TUV.Trustees:trustees
 SynMenu TUV.TSS.Command\ Line:tsscl
 SynMenu TUV.TSS.Geometry:tssgm
 SynMenu TUV.TSS.Optics:tssop
+SynMenu TUV.Udev\ config:udevconf
+SynMenu TUV.Udev\ permissions:udevperm
+SynMenu TUV.Udev\ rules:udevrules
 SynMenu TUV.UIT/UIL:uil
 SynMenu TUV.UnrealScript:uc
+SynMenu TUV.Updatedb\.conf:updatedb
 SynMenu TUV.Valgrind:valgrind
 SynMenu TUV.Verilog-AMS\ HDL:verilogams
 SynMenu TUV.Verilog\ HDL:verilog
@@ -467,15 +502,18 @@ SynMenu WXYZ.Whitespace\ (add):whitespace
 SynMenu WXYZ.WildPackets\ EtherPeek\ Decoder:dcd
 SynMenu WXYZ.WinBatch/Webbatch:winbatch
 SynMenu WXYZ.Windows\ Scripting\ Host:wsh
+SynMenu WXYZ.WSML:wsml
 SynMenu WXYZ.WvDial:wvdial
 SynMenu WXYZ.X\ Keyboard\ Extension:xkb
 SynMenu WXYZ.X\ Pixmap:xpm
 SynMenu WXYZ.X\ Pixmap\ (2):xpm2
 SynMenu WXYZ.X\ resources:xdefaults
+SynMenu WXYZ.Xinetd\.conf:xinetd
 SynMenu WXYZ.Xmodmap:xmodmap
 SynMenu WXYZ.Xmath:xmath
 SynMenu WXYZ.XML:xml
 SynMenu WXYZ.XML\ Schema\ (XSD):xsd
+SynMenu WXYZ.XQuery:xquery
 SynMenu WXYZ.Xslt:xslt
 SynMenu WXYZ.XFree86\ Config:xf86conf
 SynMenu WXYZ.YAML:yaml
--- a/runtime/spell/es/main.aap
+++ b/runtime/spell/es/main.aap
@@ -49,7 +49,7 @@ es_ES.aff es_ES.dic: {buildcheck=}
        :fetch $ZIPFILE_ES
        :sys $UNZIP $ZIPFILE_ES
        :delete add-to--dictionary.lst.example
-        #:delete $ZIPFILE_ES
+        :delete $ZIPFILE_ES
        @if not os.path.exists('es_ES.orig.aff'):
            :copy es_ES.aff es_ES.orig.aff
        @if not os.path.exists('es_ES.orig.dic'):
@@ -62,7 +62,7 @@ es_MX.aff es_MX.dic: {buildcheck=}
        :fetch $ZIPFILE_MX
        :print No copyright information for es_MX wordlist >! README_es_MX.txt
        :sys $UNZIP $ZIPFILE_MX
-        #:delete $ZIPFILE_MX
+        :delete $ZIPFILE_MX
        :sys $VIM -e -c "set ff=unix | wq" es_MX.dic
        @if not os.path.exists('es_MX.orig.aff'):
            :copy es_MX.aff es_MX.orig.aff
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -31,55 +31,58 @@ endfun
 " The following menu items are generated by makemenu.vim.
 " The Start Of The Syntax Menu

-an 50.10.100 &Syntax.AB.Aap :cal SetSyn("aap")<CR>
-an 50.10.110 &Syntax.AB.ABAP/4 :cal SetSyn("abap")<CR>
-an 50.10.120 &Syntax.AB.Abaqus :cal SetSyn("abaqus")<CR>
-an 50.10.130 &Syntax.AB.ABC\ music\ notation :cal SetSyn("abc")<CR>
-an 50.10.140 &Syntax.AB.ABEL :cal SetSyn("abel")<CR>
-an 50.10.150 &Syntax.AB.AceDB\ model :cal SetSyn("acedb")<CR>
-an 50.10.160 &Syntax.AB.Ada :cal SetSyn("ada")<CR>
-an 50.10.170 &Syntax.AB.AfLex :cal SetSyn("aflex")<CR>
-an 50.10.180 &Syntax.AB.ALSA\ config :cal SetSyn("alsaconf")<CR>
-an 50.10.190 &Syntax.AB.Altera\ AHDL :cal SetSyn("ahdl")<CR>
-an 50.10.200 &Syntax.AB.Amiga\ DOS :cal SetSyn("amiga")<CR>
-an 50.10.210 &Syntax.AB.AMPL :cal SetSyn("ampl")<CR>
-an 50.10.220 &Syntax.AB.Ant\ build\ file :cal SetSyn("ant")<CR>
-an 50.10.230 &Syntax.AB.ANTLR :cal SetSyn("antlr")<CR>
-an 50.10.240 &Syntax.AB.Apache\ config :cal SetSyn("apache")<CR>
-an 50.10.250 &Syntax.AB.Apache-style\ config :cal SetSyn("apachestyle")<CR>
-an 50.10.260 &Syntax.AB.Applix\ ELF :cal SetSyn("elf")<CR>
-an 50.10.270 &Syntax.AB.Arc\ Macro\ Language :cal SetSyn("aml")<CR>
-an 50.10.280 &Syntax.AB.Arch\ inventory :cal SetSyn("arch")<CR>
-an 50.10.290 &Syntax.AB.ART :cal SetSyn("art")<CR>
-an 50.10.300 &Syntax.AB.ASP\ with\ VBScript :cal SetSyn("aspvbs")<CR>
-an 50.10.310 &Syntax.AB.ASP\ with\ Perl :cal SetSyn("aspperl")<CR>
-an 50.10.320 &Syntax.AB.Assembly.680x0 :cal SetSyn("asm68k")<CR>
-an 50.10.330 &Syntax.AB.Assembly.Flat :cal SetSyn("fasm")<CR>
-an 50.10.340 &Syntax.AB.Assembly.GNU :cal SetSyn("asm")<CR>
-an 50.10.350 &Syntax.AB.Assembly.GNU\ H-8300 :cal SetSyn("asmh8300")<CR>
-an 50.10.360 &Syntax.AB.Assembly.Intel\ IA-64 :cal SetSyn("ia64")<CR>
-an 50.10.370 &Syntax.AB.Assembly.Microsoft :cal SetSyn("masm")<CR>
-an 50.10.380 &Syntax.AB.Assembly.Netwide :cal SetSyn("nasm")<CR>
-an 50.10.390 &Syntax.AB.Assembly.PIC :cal SetSyn("pic")<CR>
-an 50.10.400 &Syntax.AB.Assembly.Turbo :cal SetSyn("tasm")<CR>
-an 50.10.410 &Syntax.AB.Assembly.VAX\ Macro\ Assembly :cal SetSyn("vmasm")<CR>
-an 50.10.420 &Syntax.AB.Assembly.Z-80 :cal SetSyn("z8a")<CR>
-an 50.10.430 &Syntax.AB.Assembly.xa\ 6502\ cross\ assember :cal SetSyn("a65")<CR>
-an 50.10.440 &Syntax.AB.ASN\.1 :cal SetSyn("asn")<CR>
-an 50.10.450 &Syntax.AB.Atlas :cal SetSyn("atlas")<CR>
-an 50.10.460 &Syntax.AB.Automake :cal SetSyn("automake")<CR>
-an 50.10.470 &Syntax.AB.Avenue :cal SetSyn("ave")<CR>
-an 50.10.480 &Syntax.AB.Awk :cal SetSyn("awk")<CR>
-an 50.10.490 &Syntax.AB.AYacc :cal SetSyn("ayacc")<CR>
-an 50.10.510 &Syntax.AB.B :cal SetSyn("b")<CR>
-an 50.10.520 &Syntax.AB.Baan :cal SetSyn("baan")<CR>
-an 50.10.530 &Syntax.AB.BASIC :cal SetSyn("basic")<CR>
-an 50.10.540 &Syntax.AB.BC\ calculator :cal SetSyn("bc")<CR>
-an 50.10.550 &Syntax.AB.BDF\ font :cal SetSyn("bdf")<CR>
-an 50.10.560 &Syntax.AB.BibTeX :cal SetSyn("bib")<CR>
-an 50.10.570 &Syntax.AB.BIND.BIND\ config :cal SetSyn("named")<CR>
-an 50.10.580 &Syntax.AB.BIND.BIND\ zone :cal SetSyn("bindzone")<CR>
-an 50.10.590 &Syntax.AB.Blank :cal SetSyn("blank")<CR>
+an 50.10.100 &Syntax.AB.A2ps\ config :cal SetSyn("a2ps")<CR>
+an 50.10.110 &Syntax.AB.Aap :cal SetSyn("aap")<CR>
+an 50.10.120 &Syntax.AB.ABAP/4 :cal SetSyn("abap")<CR>
+an 50.10.130 &Syntax.AB.Abaqus :cal SetSyn("abaqus")<CR>
+an 50.10.140 &Syntax.AB.ABC\ music\ notation :cal SetSyn("abc")<CR>
+an 50.10.150 &Syntax.AB.ABEL :cal SetSyn("abel")<CR>
+an 50.10.160 &Syntax.AB.AceDB\ model :cal SetSyn("acedb")<CR>
+an 50.10.170 &Syntax.AB.Ada :cal SetSyn("ada")<CR>
+an 50.10.180 &Syntax.AB.AfLex :cal SetSyn("aflex")<CR>
+an 50.10.190 &Syntax.AB.ALSA\ config :cal SetSyn("alsaconf")<CR>
+an 50.10.200 &Syntax.AB.Altera\ AHDL :cal SetSyn("ahdl")<CR>
+an 50.10.210 &Syntax.AB.Amiga\ DOS :cal SetSyn("amiga")<CR>
+an 50.10.220 &Syntax.AB.AMPL :cal SetSyn("ampl")<CR>
+an 50.10.230 &Syntax.AB.Ant\ build\ file :cal SetSyn("ant")<CR>
+an 50.10.240 &Syntax.AB.ANTLR :cal SetSyn("antlr")<CR>
+an 50.10.250 &Syntax.AB.Apache\ config :cal SetSyn("apache")<CR>
+an 50.10.260 &Syntax.AB.Apache-style\ config :cal SetSyn("apachestyle")<CR>
+an 50.10.270 &Syntax.AB.Applix\ ELF :cal SetSyn("elf")<CR>
+an 50.10.280 &Syntax.AB.Arc\ Macro\ Language :cal SetSyn("aml")<CR>
+an 50.10.290 &Syntax.AB.Arch\ inventory :cal SetSyn("arch")<CR>
+an 50.10.300 &Syntax.AB.ART :cal SetSyn("art")<CR>
+an 50.10.310 &Syntax.AB.ASP\ with\ VBScript :cal SetSyn("aspvbs")<CR>
+an 50.10.320 &Syntax.AB.ASP\ with\ Perl :cal SetSyn("aspperl")<CR>
+an 50.10.330 &Syntax.AB.Assembly.680x0 :cal SetSyn("asm68k")<CR>
+an 50.10.340 &Syntax.AB.Assembly.Flat :cal SetSyn("fasm")<CR>
+an 50.10.350 &Syntax.AB.Assembly.GNU :cal SetSyn("asm")<CR>
+an 50.10.360 &Syntax.AB.Assembly.GNU\ H-8300 :cal SetSyn("asmh8300")<CR>
+an 50.10.370 &Syntax.AB.Assembly.Intel\ IA-64 :cal SetSyn("ia64")<CR>
+an 50.10.380 &Syntax.AB.Assembly.Microsoft :cal SetSyn("masm")<CR>
+an 50.10.390 &Syntax.AB.Assembly.Netwide :cal SetSyn("nasm")<CR>
+an 50.10.400 &Syntax.AB.Assembly.PIC :cal SetSyn("pic")<CR>
+an 50.10.410 &Syntax.AB.Assembly.Turbo :cal SetSyn("tasm")<CR>
+an 50.10.420 &Syntax.AB.Assembly.VAX\ Macro\ Assembly :cal SetSyn("vmasm")<CR>
+an 50.10.430 &Syntax.AB.Assembly.Z-80 :cal SetSyn("z8a")<CR>
+an 50.10.440 &Syntax.AB.Assembly.xa\ 6502\ cross\ assember :cal SetSyn("a65")<CR>
+an 50.10.450 &Syntax.AB.ASN\.1 :cal SetSyn("asn")<CR>
+an 50.10.460 &Syntax.AB.Asterisk\ config :cal SetSyn("asterisk")<CR>
+an 50.10.470 &Syntax.AB.Asterisk\ voicemail\ config :cal SetSyn("asteriskvm")<CR>
+an 50.10.480 &Syntax.AB.Atlas :cal SetSyn("atlas")<CR>
+an 50.10.490 &Syntax.AB.Automake :cal SetSyn("automake")<CR>
+an 50.10.500 &Syntax.AB.Avenue :cal SetSyn("ave")<CR>
+an 50.10.510 &Syntax.AB.Awk :cal SetSyn("awk")<CR>
+an 50.10.520 &Syntax.AB.AYacc :cal SetSyn("ayacc")<CR>
+an 50.10.540 &Syntax.AB.B :cal SetSyn("b")<CR>
+an 50.10.550 &Syntax.AB.Baan :cal SetSyn("baan")<CR>
+an 50.10.560 &Syntax.AB.BASIC :cal SetSyn("basic")<CR>
+an 50.10.570 &Syntax.AB.BC\ calculator :cal SetSyn("bc")<CR>
+an 50.10.580 &Syntax.AB.BDF\ font :cal SetSyn("bdf")<CR>
+an 50.10.590 &Syntax.AB.BibTeX :cal SetSyn("bib")<CR>
+an 50.10.600 &Syntax.AB.BIND.BIND\ config :cal SetSyn("named")<CR>
+an 50.10.610 &Syntax.AB.BIND.BIND\ zone :cal SetSyn("bindzone")<CR>
+an 50.10.620 &Syntax.AB.Blank :cal SetSyn("blank")<CR>
 an 50.20.100 &Syntax.C.C :cal SetSyn("c")<CR>
 an 50.20.110 &Syntax.C.C++ :cal SetSyn("cpp")<CR>
 an 50.20.120 &Syntax.C.C# :cal SetSyn("cs")<CR>
@@ -101,44 +104,52 @@ an 50.20.270 &Syntax.C.Cold\ Fusion :cal SetSyn("cf")<CR>
 an 50.20.280 &Syntax.C.Config.Cfg\ Config\ file :cal SetSyn("cfg")<CR>
 an 50.20.290 &Syntax.C.Config.Generic\ Config\ file :cal SetSyn("conf")<CR>
 an 50.20.300 &Syntax.C.Config.Configure\.in :cal SetSyn("config")<CR>
-an 50.20.310 &Syntax.C.CRM114 :cal SetSyn("crm")<CR>
-an 50.20.320 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
-an 50.20.330 &Syntax.C.Cobol :cal SetSyn("cobol")<CR>
-an 50.20.340 &Syntax.C.CSP :cal SetSyn("csp")<CR>
-an 50.20.350 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
-an 50.20.360 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
-an 50.20.370 &Syntax.C.CVS.commit\ file :cal SetSyn("cvs")<CR>
-an 50.20.380 &Syntax.C.CVS.cvsrc :cal SetSyn("cvsrc")<CR>
+an 50.20.310 &Syntax.C.ConTeXt :cal SetSyn("context")<CR>
+an 50.20.320 &Syntax.C.CRM114 :cal SetSyn("crm")<CR>
+an 50.20.330 &Syntax.C.Ctrl-H :cal SetSyn("ctrlh")<CR>
+an 50.20.340 &Syntax.C.Cobol :cal SetSyn("cobol")<CR>
+an 50.20.350 &Syntax.C.CSP :cal SetSyn("csp")<CR>
+an 50.20.360 &Syntax.C.CUPL.CUPL :cal SetSyn("cupl")<CR>
+an 50.20.370 &Syntax.C.CUPL.Simulation :cal SetSyn("cuplsim")<CR>
+an 50.20.380 &Syntax.C.CVS.commit\ file :cal SetSyn("cvs")<CR>
+an 50.20.390 &Syntax.C.CVS.cvsrc :cal SetSyn("cvsrc")<CR>
 an 50.30.100 &Syntax.DE.D :cal SetSyn("d")<CR>
 an 50.30.110 &Syntax.DE.Debian.Debian\ ChangeLog :cal SetSyn("debchangelog")<CR>
 an 50.30.120 &Syntax.DE.Debian.Debian\ Control :cal SetSyn("debcontrol")<CR>
 an 50.30.130 &Syntax.DE.Desktop :cal SetSyn("desktop")<CR>
-an 50.30.140 &Syntax.DE.Diff :cal SetSyn("diff")<CR>
-an 50.30.150 &Syntax.DE.Digital\ Command\ Lang :cal SetSyn("dcl")<CR>
-an 50.30.160 &Syntax.DE.Dircolors :cal SetSyn("dircolors")<CR>
-an 50.30.170 &Syntax.DE.DNS/BIND\ zone :cal SetSyn("dns")<CR>
-an 50.30.180 &Syntax.DE.DocBook.auto-detect :cal SetSyn("docbk")<CR>
-an 50.30.190 &Syntax.DE.DocBook.SGML :cal SetSyn("docbksgml")<CR>
-an 50.30.200 &Syntax.DE.DocBook.XML :cal SetSyn("docbkxml")<CR>
-an 50.30.210 &Syntax.DE.Dot :cal SetSyn("dot")<CR>
-an 50.30.220 &Syntax.DE.Dracula :cal SetSyn("dracula")<CR>
-an 50.30.230 &Syntax.DE.DSSSL :cal SetSyn("dsl")<CR>
-an 50.30.240 &Syntax.DE.DTD :cal SetSyn("dtd")<CR>
-an 50.30.250 &Syntax.DE.DTML\ (Zope) :cal SetSyn("dtml")<CR>
-an 50.30.260 &Syntax.DE.Dylan.Dylan :cal SetSyn("dylan")<CR>
-an 50.30.270 &Syntax.DE.Dylan.Dylan\ interface :cal SetSyn("dylanintr")<CR>
-an 50.30.280 &Syntax.DE.Dylan.Dylan\ lid :cal SetSyn("dylanlid")<CR>
-an 50.30.300 &Syntax.DE.EDIF :cal SetSyn("edif")<CR>
-an 50.30.310 &Syntax.DE.Eiffel :cal SetSyn("eiffel")<CR>
-an 50.30.320 &Syntax.DE.Elinks\ config :cal SetSyn("elinks")<CR>
-an 50.30.330 &Syntax.DE.Elm\ filter\ rules :cal SetSyn("elmfilt")<CR>
-an 50.30.340 &Syntax.DE.Embedix\ Component\ Description :cal SetSyn("ecd")<CR>
-an 50.30.350 &Syntax.DE.ERicsson\ LANGuage :cal SetSyn("erlang")<CR>
-an 50.30.360 &Syntax.DE.Essbase\ script :cal SetSyn("csc")<CR>
-an 50.30.370 &Syntax.DE.Eterm\ config :cal SetSyn("eterm")<CR>
-an 50.30.380 &Syntax.DE.Exim\ conf :cal SetSyn("exim")<CR>
-an 50.30.390 &Syntax.DE.Expect :cal SetSyn("expect")<CR>
-an 50.30.400 &Syntax.DE.Exports :cal SetSyn("exports")<CR>
+an 50.30.140 &Syntax.DE.Dict\ config :cal SetSyn("dictconf")<CR>
+an 50.30.150 &Syntax.DE.Dictd\ config :cal SetSyn("dictdconf")<CR>
+an 50.30.160 &Syntax.DE.Diff :cal SetSyn("diff")<CR>
+an 50.30.170 &Syntax.DE.Digital\ Command\ Lang :cal SetSyn("dcl")<CR>
+an 50.30.180 &Syntax.DE.Dircolors :cal SetSyn("dircolors")<CR>
+an 50.30.190 &Syntax.DE.Django\ template :cal SetSyn("django")<CR>
+an 50.30.200 &Syntax.DE.DNS/BIND\ zone :cal SetSyn("dns")<CR>
+an 50.30.210 &Syntax.DE.DocBook.auto-detect :cal SetSyn("docbk")<CR>
+an 50.30.220 &Syntax.DE.DocBook.SGML :cal SetSyn("docbksgml")<CR>
+an 50.30.230 &Syntax.DE.DocBook.XML :cal SetSyn("docbkxml")<CR>
+an 50.30.240 &Syntax.DE.Dot :cal SetSyn("dot")<CR>
+an 50.30.250 &Syntax.DE.Dracula :cal SetSyn("dracula")<CR>
+an 50.30.260 &Syntax.DE.DSSSL :cal SetSyn("dsl")<CR>
+an 50.30.270 &Syntax.DE.DTD :cal SetSyn("dtd")<CR>
+an 50.30.280 &Syntax.DE.DTML\ (Zope) :cal SetSyn("dtml")<CR>
+an 50.30.290 &Syntax.DE.Dylan.Dylan :cal SetSyn("dylan")<CR>
+an 50.30.300 &Syntax.DE.Dylan.Dylan\ interface :cal SetSyn("dylanintr")<CR>
+an 50.30.310 &Syntax.DE.Dylan.Dylan\ lid :cal SetSyn("dylanlid")<CR>
+an 50.30.330 &Syntax.DE.EDIF :cal SetSyn("edif")<CR>
+an 50.30.340 &Syntax.DE.Eiffel :cal SetSyn("eiffel")<CR>
+an 50.30.350 &Syntax.DE.Elinks\ config :cal SetSyn("elinks")<CR>
+an 50.30.360 &Syntax.DE.Elm\ filter\ rules :cal SetSyn("elmfilt")<CR>
+an 50.30.370 &Syntax.DE.Embedix\ Component\ Description :cal SetSyn("ecd")<CR>
+an 50.30.380 &Syntax.DE.ERicsson\ LANGuage :cal SetSyn("erlang")<CR>
+an 50.30.390 &Syntax.DE.ESMTP\ rc :cal SetSyn("esmtprc")<CR>
+an 50.30.400 &Syntax.DE.ESQL-C :cal SetSyn("esqlc")<CR>
+an 50.30.410 &Syntax.DE.Essbase\ script :cal SetSyn("csc")<CR>
+an 50.30.420 &Syntax.DE.Esterel :cal SetSyn("esterel")<CR>
+an 50.30.430 &Syntax.DE.Eterm\ config :cal SetSyn("eterm")<CR>
+an 50.30.440 &Syntax.DE.Eviews :cal SetSyn("eviews")<CR>
+an 50.30.450 &Syntax.DE.Exim\ conf :cal SetSyn("exim")<CR>
+an 50.30.460 &Syntax.DE.Expect :cal SetSyn("expect")<CR>
+an 50.30.470 &Syntax.DE.Exports :cal SetSyn("exports")<CR>
 an 50.40.100 &Syntax.FG.Fetchmail :cal SetSyn("fetchmail")<CR>
 an 50.40.110 &Syntax.FG.Focus\ Executable :cal SetSyn("focexec")<CR>
 an 50.40.120 &Syntax.FG.Focus\ Master :cal SetSyn("master")<CR>
@@ -156,12 +167,15 @@ an 50.40.240 &Syntax.FG.Gedcom :cal SetSyn("gedcom")<CR>
 an 50.40.250 &Syntax.FG.Gkrellmrc :cal SetSyn("gkrellmrc")<CR>
 an 50.40.260 &Syntax.FG.GP :cal SetSyn("gp")<CR>
 an 50.40.270 &Syntax.FG.GPG :cal SetSyn("gpg")<CR>
-an 50.40.280 &Syntax.FG.Grub :cal SetSyn("grub")<CR>
-an 50.40.290 &Syntax.FG.GNU\ Server\ Pages :cal SetSyn("gsp")<CR>
-an 50.40.300 &Syntax.FG.GNUplot :cal SetSyn("gnuplot")<CR>
-an 50.40.310 &Syntax.FG.GrADS\ scripts :cal SetSyn("grads")<CR>
-an 50.40.320 &Syntax.FG.Groff :cal SetSyn("groff")<CR>
-an 50.40.330 &Syntax.FG.GTKrc :cal SetSyn("gtkrc")<CR>
+an 50.40.280 &Syntax.FG.Group\ file :cal SetSyn("group")<CR>
+an 50.40.290 &Syntax.FG.Grub :cal SetSyn("grub")<CR>
+an 50.40.300 &Syntax.FG.GNU\ Server\ Pages :cal SetSyn("gsp")<CR>
+an 50.40.310 &Syntax.FG.GNUplot :cal SetSyn("gnuplot")<CR>
+an 50.40.320 &Syntax.FG.GrADS\ scripts :cal SetSyn("grads")<CR>
+an 50.40.330 &Syntax.FG.Gretl :cal SetSyn("gretl")<CR>
+an 50.40.340 &Syntax.FG.Groff :cal SetSyn("groff")<CR>
+an 50.40.350 &Syntax.FG.Groovy :cal SetSyn("groovy")<CR>
+an 50.40.360 &Syntax.FG.GTKrc :cal SetSyn("gtkrc")<CR>
 an 50.50.100 &Syntax.HIJK.Haskell.Haskell :cal SetSyn("haskell")<CR>
 an 50.50.110 &Syntax.HIJK.Haskell.Haskell-c2hs :cal SetSyn("chaskell")<CR>
 an 50.50.120 &Syntax.HIJK.Haskell.Haskell-literate :cal SetSyn("lhaskell")<CR>
@@ -170,168 +184,192 @@ an 50.50.140 &Syntax.HIJK.Hex\ dump.XXD :cal SetSyn("xxd")<CR>
 an 50.50.150 &Syntax.HIJK.Hex\ dump.Intel\ MCS51 :cal SetSyn("hex")<CR>
 an 50.50.160 &Syntax.HIJK.HTML.HTML :cal SetSyn("html")<CR>
 an 50.50.170 &Syntax.HIJK.HTML.HTML\ with\ M4 :cal SetSyn("htmlm4")<CR>
-an 50.50.180 &Syntax.HIJK.HTML.Cheetah\ HTML\ template :cal SetSyn("htmlcheetah")<CR>
-an 50.50.190 &Syntax.HIJK.HTML.HTML/OS :cal SetSyn("htmlos")<CR>
-an 50.50.200 &Syntax.HIJK.HTML.XHTML :cal SetSyn("xhtml")<CR>
-an 50.50.210 &Syntax.HIJK.Hyper\ Builder :cal SetSyn("hb")<CR>
-an 50.50.230 &Syntax.HIJK.Icewm\ menu :cal SetSyn("icemenu")<CR>
-an 50.50.240 &Syntax.HIJK.Icon :cal SetSyn("icon")<CR>
-an 50.50.250 &Syntax.HIJK.IDL\Generic\ IDL :cal SetSyn("idl")<CR>
-an 50.50.260 &Syntax.HIJK.IDL\Microsoft\ IDL :cal SetSyn("msidl")<CR>
-an 50.50.270 &Syntax.HIJK.Indent\ profile :cal SetSyn("indent")<CR>
-an 50.50.280 &Syntax.HIJK.Inform :cal SetSyn("inform")<CR>
-an 50.50.290 &Syntax.HIJK.Informix\ 4GL :cal SetSyn("fgl")<CR>
-an 50.50.300 &Syntax.HIJK.Inittab :cal SetSyn("inittab")<CR>
-an 50.50.310 &Syntax.HIJK.Inno\ setup :cal SetSyn("iss")<CR>
-an 50.50.320 &Syntax.HIJK.InstallShield\ script :cal SetSyn("ishd")<CR>
-an 50.50.330 &Syntax.HIJK.Interactive\ Data\ Lang :cal SetSyn("idlang")<CR>
-an 50.50.340 &Syntax.HIJK.IPfilter :cal SetSyn("ipfilter")<CR>
-an 50.50.360 &Syntax.HIJK.JAL :cal SetSyn("jal")<CR>
-an 50.50.370 &Syntax.HIJK.JAM :cal SetSyn("jam")<CR>
-an 50.50.380 &Syntax.HIJK.Jargon :cal SetSyn("jargon")<CR>
-an 50.50.390 &Syntax.HIJK.Java.Java :cal SetSyn("java")<CR>
-an 50.50.400 &Syntax.HIJK.Java.JavaCC :cal SetSyn("javacc")<CR>
-an 50.50.410 &Syntax.HIJK.Java.Java\ Server\ Pages :cal SetSyn("jsp")<CR>
-an 50.50.420 &Syntax.HIJK.Java.Java\ Properties :cal SetSyn("jproperties")<CR>
-an 50.50.430 &Syntax.HIJK.JavaScript :cal SetSyn("javascript")<CR>
-an 50.50.440 &Syntax.HIJK.Jess :cal SetSyn("jess")<CR>
-an 50.50.450 &Syntax.HIJK.Jgraph :cal SetSyn("jgraph")<CR>
-an 50.50.470 &Syntax.HIJK.KDE\ script :cal SetSyn("kscript")<CR>
-an 50.50.480 &Syntax.HIJK.Kimwitu++ :cal SetSyn("kwt")<CR>
-an 50.50.490 &Syntax.HIJK.KixTart :cal SetSyn("kix")<CR>
+an 50.50.180 &Syntax.HIJK.HTML.HTML\ with\ Ruby\ (eRuby) :cal SetSyn("eruby")<CR>
+an 50.50.190 &Syntax.HIJK.HTML.Cheetah\ HTML\ template :cal SetSyn("htmlcheetah")<CR>
+an 50.50.200 &Syntax.HIJK.HTML.Django\ HTML\ template :cal SetSyn("htmldjango")<CR>
+an 50.50.210 &Syntax.HIJK.HTML.HTML/OS :cal SetSyn("htmlos")<CR>
+an 50.50.220 &Syntax.HIJK.HTML.XHTML :cal SetSyn("xhtml")<CR>
+an 50.50.230 &Syntax.HIJK.Hyper\ Builder :cal SetSyn("hb")<CR>
+an 50.50.250 &Syntax.HIJK.Icewm\ menu :cal SetSyn("icemenu")<CR>
+an 50.50.260 &Syntax.HIJK.Icon :cal SetSyn("icon")<CR>
+an 50.50.270 &Syntax.HIJK.IDL\Generic\ IDL :cal SetSyn("idl")<CR>
+an 50.50.280 &Syntax.HIJK.IDL\Microsoft\ IDL :cal SetSyn("msidl")<CR>
+an 50.50.290 &Syntax.HIJK.Indent\ profile :cal SetSyn("indent")<CR>
+an 50.50.300 &Syntax.HIJK.Inform :cal SetSyn("inform")<CR>
+an 50.50.310 &Syntax.HIJK.Informix\ 4GL :cal SetSyn("fgl")<CR>
+an 50.50.320 &Syntax.HIJK.Inittab :cal SetSyn("inittab")<CR>
+an 50.50.330 &Syntax.HIJK.Inno\ setup :cal SetSyn("iss")<CR>
+an 50.50.340 &Syntax.HIJK.InstallShield\ script :cal SetSyn("ishd")<CR>
+an 50.50.350 &Syntax.HIJK.Interactive\ Data\ Lang :cal SetSyn("idlang")<CR>
+an 50.50.360 &Syntax.HIJK.IPfilter :cal SetSyn("ipfilter")<CR>
+an 50.50.380 &Syntax.HIJK.JAL :cal SetSyn("jal")<CR>
+an 50.50.390 &Syntax.HIJK.JAM :cal SetSyn("jam")<CR>
+an 50.50.400 &Syntax.HIJK.Jargon :cal SetSyn("jargon")<CR>
+an 50.50.410 &Syntax.HIJK.Java.Java :cal SetSyn("java")<CR>
+an 50.50.420 &Syntax.HIJK.Java.JavaCC :cal SetSyn("javacc")<CR>
+an 50.50.430 &Syntax.HIJK.Java.Java\ Server\ Pages :cal SetSyn("jsp")<CR>
+an 50.50.440 &Syntax.HIJK.Java.Java\ Properties :cal SetSyn("jproperties")<CR>
+an 50.50.450 &Syntax.HIJK.JavaScript :cal SetSyn("javascript")<CR>
+an 50.50.460 &Syntax.HIJK.Jess :cal SetSyn("jess")<CR>
+an 50.50.470 &Syntax.HIJK.Jgraph :cal SetSyn("jgraph")<CR>
+an 50.50.490 &Syntax.HIJK.KDE\ script :cal SetSyn("kscript")<CR>
+an 50.50.500 &Syntax.HIJK.Kimwitu++ :cal SetSyn("kwt")<CR>
+an 50.50.510 &Syntax.HIJK.KixTart :cal SetSyn("kix")<CR>
 an 50.60.100 &Syntax.L-Ma.Lace :cal SetSyn("lace")<CR>
 an 50.60.110 &Syntax.L-Ma.LamdaProlog :cal SetSyn("lprolog")<CR>
 an 50.60.120 &Syntax.L-Ma.Latte :cal SetSyn("latte")<CR>
-an 50.60.130 &Syntax.L-Ma.LDAP\ LDIF :cal SetSyn("ldif")<CR>
-an 50.60.140 &Syntax.L-Ma.Lex :cal SetSyn("lex")<CR>
-an 50.60.150 &Syntax.L-Ma.LFTP\ config :cal SetSyn("lftp")<CR>
-an 50.60.160 &Syntax.L-Ma.Libao :cal SetSyn("libao")<CR>
-an 50.60.170 &Syntax.L-Ma.LifeLines\ script :cal SetSyn("lifelines")<CR>
-an 50.60.180 &Syntax.L-Ma.Lilo :cal SetSyn("lilo")<CR>
-an 50.60.190 &Syntax.L-Ma.Lisp :cal SetSyn("lisp")<CR>
-an 50.60.200 &Syntax.L-Ma.Lite :cal SetSyn("lite")<CR>
-an 50.60.210 &Syntax.L-Ma.Locale\ Input :cal SetSyn("fdcc")<CR>
-an 50.60.220 &Syntax.L-Ma.Logtalk :cal SetSyn("logtalk")<CR>
-an 50.60.230 &Syntax.L-Ma.LOTOS :cal SetSyn("lotos")<CR>
-an 50.60.240 &Syntax.L-Ma.LotusScript :cal SetSyn("lscript")<CR>
-an 50.60.250 &Syntax.L-Ma.Lout :cal SetSyn("lout")<CR>
-an 50.60.260 &Syntax.L-Ma.LPC :cal SetSyn("lpc")<CR>
-an 50.60.270 &Syntax.L-Ma.Lua :cal SetSyn("lua")<CR>
-an 50.60.280 &Syntax.L-Ma.Lynx\ Style :cal SetSyn("lss")<CR>
-an 50.60.290 &Syntax.L-Ma.Lynx\ config :cal SetSyn("lynx")<CR>
-an 50.60.310 &Syntax.L-Ma.M4 :cal SetSyn("m4")<CR>
-an 50.60.320 &Syntax.L-Ma.MaGic\ Point :cal SetSyn("mgp")<CR>
-an 50.60.330 &Syntax.L-Ma.Mail :cal SetSyn("mail")<CR>
-an 50.60.340 &Syntax.L-Ma.Mailcap :cal SetSyn("mailcap")<CR>
-an 50.60.350 &Syntax.L-Ma.Makefile :cal SetSyn("make")<CR>
-an 50.60.360 &Syntax.L-Ma.MakeIndex :cal SetSyn("ist")<CR>
-an 50.60.370 &Syntax.L-Ma.Man\ page :cal SetSyn("man")<CR>
-an 50.60.380 &Syntax.L-Ma.Maple\ V :cal SetSyn("maple")<CR>
-an 50.60.390 &Syntax.L-Ma.Mason :cal SetSyn("mason")<CR>
-an 50.60.400 &Syntax.L-Ma.Mathematica :cal SetSyn("mma")<CR>
-an 50.60.410 &Syntax.L-Ma.Matlab :cal SetSyn("matlab")<CR>
+an 50.60.130 &Syntax.L-Ma.Ld\ script :cal SetSyn("ld")<CR>
+an 50.60.140 &Syntax.L-Ma.LDAP\ LDIF :cal SetSyn("ldif")<CR>
+an 50.60.150 &Syntax.L-Ma.Lex :cal SetSyn("lex")<CR>
+an 50.60.160 &Syntax.L-Ma.LFTP\ config :cal SetSyn("lftp")<CR>
+an 50.60.170 &Syntax.L-Ma.Libao :cal SetSyn("libao")<CR>
+an 50.60.180 &Syntax.L-Ma.LifeLines\ script :cal SetSyn("lifelines")<CR>
+an 50.60.190 &Syntax.L-Ma.Lilo :cal SetSyn("lilo")<CR>
+an 50.60.200 &Syntax.L-Ma.Limits\ config :cal SetSyn("limits")<CR>
+an 50.60.210 &Syntax.L-Ma.Lisp :cal SetSyn("lisp")<CR>
+an 50.60.220 &Syntax.L-Ma.Lite :cal SetSyn("lite")<CR>
+an 50.60.230 &Syntax.L-Ma.Locale\ Input :cal SetSyn("fdcc")<CR>
+an 50.60.240 &Syntax.L-Ma.Login\.access :cal SetSyn("loginaccess")<CR>
+an 50.60.250 &Syntax.L-Ma.Login\.defs :cal SetSyn("logindefs")<CR>
+an 50.60.260 &Syntax.L-Ma.Logtalk :cal SetSyn("logtalk")<CR>
+an 50.60.270 &Syntax.L-Ma.LOTOS :cal SetSyn("lotos")<CR>
+an 50.60.280 &Syntax.L-Ma.LotusScript :cal SetSyn("lscript")<CR>
+an 50.60.290 &Syntax.L-Ma.Lout :cal SetSyn("lout")<CR>
+an 50.60.300 &Syntax.L-Ma.LPC :cal SetSyn("lpc")<CR>
+an 50.60.310 &Syntax.L-Ma.Lua :cal SetSyn("lua")<CR>
+an 50.60.320 &Syntax.L-Ma.Lynx\ Style :cal SetSyn("lss")<CR>
+an 50.60.330 &Syntax.L-Ma.Lynx\ config :cal SetSyn("lynx")<CR>
+an 50.60.350 &Syntax.L-Ma.M4 :cal SetSyn("m4")<CR>
+an 50.60.360 &Syntax.L-Ma.MaGic\ Point :cal SetSyn("mgp")<CR>
+an 50.60.370 &Syntax.L-Ma.Mail :cal SetSyn("mail")<CR>
+an 50.60.380 &Syntax.L-Ma.Mailcap :cal SetSyn("mailcap")<CR>
+an 50.60.390 &Syntax.L-Ma.Makefile :cal SetSyn("make")<CR>
+an 50.60.400 &Syntax.L-Ma.MakeIndex :cal SetSyn("ist")<CR>
+an 50.60.410 &Syntax.L-Ma.Man\ page :cal SetSyn("man")<CR>
+an 50.60.420 &Syntax.L-Ma.Man\.conf :cal SetSyn("manconf")<CR>
+an 50.60.430 &Syntax.L-Ma.Maple\ V :cal SetSyn("maple")<CR>
+an 50.60.440 &Syntax.L-Ma.Mason :cal SetSyn("mason")<CR>
+an 50.60.450 &Syntax.L-Ma.Mathematica :cal SetSyn("mma")<CR>
+an 50.60.460 &Syntax.L-Ma.Matlab :cal SetSyn("matlab")<CR>
 an 50.70.100 &Syntax.Me-NO.MEL\ (for\ Maya) :cal SetSyn("mel")<CR>
 an 50.70.110 &Syntax.Me-NO.Metafont :cal SetSyn("mf")<CR>
 an 50.70.120 &Syntax.Me-NO.MetaPost :cal SetSyn("mp")<CR>
-an 50.70.130 &Syntax.Me-NO.MMIX :cal SetSyn("mmix")<CR>
-an 50.70.140 &Syntax.Me-NO.Modconf :cal SetSyn("modconf")<CR>
-an 50.70.150 &Syntax.Me-NO.Model :cal SetSyn("model")<CR>
-an 50.70.160 &Syntax.Me-NO.Modsim\ III :cal SetSyn("modsim3")<CR>
-an 50.70.170 &Syntax.Me-NO.Modula\ 2 :cal SetSyn("modula2")<CR>
-an 50.70.180 &Syntax.Me-NO.Modula\ 3 :cal SetSyn("modula3")<CR>
-an 50.70.190 &Syntax.Me-NO.Monk :cal SetSyn("monk")<CR>
-an 50.70.200 &Syntax.Me-NO.Mplayer\ config :cal SetSyn("mplayerconf")<CR>
-an 50.70.210 &Syntax.Me-NO.MOO :cal SetSyn("moo")<CR>
-an 50.70.220 &Syntax.Me-NO.MS-DOS/Windows.4DOS\ \.bat\ file :cal SetSyn("btm")<CR>
-an 50.70.230 &Syntax.Me-NO.MS-DOS/Windows.\.bat\/\.cmd\ file :cal SetSyn("dosbatch")<CR>
-an 50.70.240 &Syntax.Me-NO.MS-DOS/Windows.\.ini\ file :cal SetSyn("dosini")<CR>
-an 50.70.250 &Syntax.Me-NO.MS-DOS/Windows.Module\ Definition :cal SetSyn("def")<CR>
-an 50.70.260 &Syntax.Me-NO.MS-DOS/Windows.Registry :cal SetSyn("registry")<CR>
-an 50.70.270 &Syntax.Me-NO.MS-DOS/Windows.Resource\ file :cal SetSyn("rc")<CR>
-an 50.70.280 &Syntax.Me-NO.Msql :cal SetSyn("msql")<CR>
-an 50.70.290 &Syntax.Me-NO.MUSHcode :cal SetSyn("mush")<CR>
-an 50.70.300 &Syntax.Me-NO.Muttrc :cal SetSyn("muttrc")<CR>
-an 50.70.320 &Syntax.Me-NO.Nastran\ input/DMAP :cal SetSyn("nastran")<CR>
-an 50.70.330 &Syntax.Me-NO.Natural :cal SetSyn("natural")<CR>
-an 50.70.340 &Syntax.Me-NO.Novell\ NCF\ batch :cal SetSyn("ncf")<CR>
-an 50.70.350 &Syntax.Me-NO.Not\ Quite\ C\ (LEGO) :cal SetSyn("nqc")<CR>
-an 50.70.360 &Syntax.Me-NO.Nroff :cal SetSyn("nroff")<CR>
-an 50.70.370 &Syntax.Me-NO.NSIS\ script :cal SetSyn("nsis")<CR>
-an 50.70.390 &Syntax.Me-NO.Objective\ C :cal SetSyn("objc")<CR>
-an 50.70.400 &Syntax.Me-NO.Objective\ C++ :cal SetSyn("objcpp")<CR>
-an 50.70.410 &Syntax.Me-NO.OCAML :cal SetSyn("ocaml")<CR>
-an 50.70.420 &Syntax.Me-NO.Occam :cal SetSyn("occam")<CR>
-an 50.70.430 &Syntax.Me-NO.Omnimark :cal SetSyn("omnimark")<CR>
-an 50.70.440 &Syntax.Me-NO.OpenROAD :cal SetSyn("openroad")<CR>
-an 50.70.450 &Syntax.Me-NO.Open\ Psion\ Lang :cal SetSyn("opl")<CR>
-an 50.70.460 &Syntax.Me-NO.Oracle\ config :cal SetSyn("ora")<CR>
-an 50.80.100 &Syntax.PQ.Palm\ resource\ compiler :cal SetSyn("pilrc")<CR>
-an 50.80.110 &Syntax.PQ.Packet\ filter\ conf :cal SetSyn("pf")<CR>
-an 50.80.120 &Syntax.PQ.PApp :cal SetSyn("papp")<CR>
-an 50.80.130 &Syntax.PQ.Pascal :cal SetSyn("pascal")<CR>
-an 50.80.140 &Syntax.PQ.PCCTS :cal SetSyn("pccts")<CR>
-an 50.80.150 &Syntax.PQ.PPWizard :cal SetSyn("ppwiz")<CR>
-an 50.80.160 &Syntax.PQ.Perl.Perl :cal SetSyn("perl")<CR>
-an 50.80.170 &Syntax.PQ.Perl.Perl\ POD :cal SetSyn("pod")<CR>
-an 50.80.180 &Syntax.PQ.Perl.Perl\ XS :cal SetSyn("xs")<CR>
-an 50.80.190 &Syntax.PQ.PHP.PHP\ 3-4 :cal SetSyn("php")<CR>
-an 50.80.200 &Syntax.PQ.PHP.Phtml\ (PHP\ 2) :cal SetSyn("phtml")<CR>
-an 50.80.210 &Syntax.PQ.Pike :cal SetSyn("pike")<CR>
-an 50.80.220 &Syntax.PQ.Pine\ RC :cal SetSyn("pine")<CR>
-an 50.80.230 &Syntax.PQ.Pinfo\ RC :cal SetSyn("pinfo")<CR>
-an 50.80.240 &Syntax.PQ.PL/M :cal SetSyn("plm")<CR>
-an 50.80.250 &Syntax.PQ.PLP :cal SetSyn("plp")<CR>
-an 50.80.260 &Syntax.PQ.PO\ (GNU\ gettext) :cal SetSyn("po")<CR>
-an 50.80.270 &Syntax.PQ.Postfix\ main\ config :cal SetSyn("pfmain")<CR>
-an 50.80.280 &Syntax.PQ.PostScript.PostScript :cal SetSyn("postscr")<CR>
-an 50.80.290 &Syntax.PQ.PostScript.PostScript\ Printer\ Description :cal SetSyn("ppd")<CR>
-an 50.80.300 &Syntax.PQ.Povray.Povray\ scene\ descr :cal SetSyn("pov")<CR>
-an 50.80.310 &Syntax.PQ.Povray.Povray\ configuration :cal SetSyn("povini")<CR>
-an 50.80.320 &Syntax.PQ.Printcap :cal SetSyn("pcap")<CR>
-an 50.80.330 &Syntax.PQ.Procmail :cal SetSyn("procmail")<CR>
-an 50.80.340 &Syntax.PQ.Product\ Spec\ File :cal SetSyn("psf")<CR>
-an 50.80.350 &Syntax.PQ.Progress :cal SetSyn("progress")<CR>
-an 50.80.360 &Syntax.PQ.Prolog :cal SetSyn("prolog")<CR>
-an 50.80.370 &Syntax.PQ.Purify\ log :cal SetSyn("purifylog")<CR>
-an 50.80.380 &Syntax.PQ.Pyrex :cal SetSyn("pyrex")<CR>
-an 50.80.390 &Syntax.PQ.Python :cal SetSyn("python")<CR>
-an 50.80.410 &Syntax.PQ.Quake :cal SetSyn("quake")<CR>
-an 50.80.420 &Syntax.PQ.Quickfix\ window :cal SetSyn("qf")<CR>
+an 50.70.130 &Syntax.Me-NO.MGL :cal SetSyn("mgl")<CR>
+an 50.70.140 &Syntax.Me-NO.MMIX :cal SetSyn("mmix")<CR>
+an 50.70.150 &Syntax.Me-NO.Modconf :cal SetSyn("modconf")<CR>
+an 50.70.160 &Syntax.Me-NO.Model :cal SetSyn("model")<CR>
+an 50.70.170 &Syntax.Me-NO.Modsim\ III :cal SetSyn("modsim3")<CR>
+an 50.70.180 &Syntax.Me-NO.Modula\ 2 :cal SetSyn("modula2")<CR>
+an 50.70.190 &Syntax.Me-NO.Modula\ 3 :cal SetSyn("modula3")<CR>
+an 50.70.200 &Syntax.Me-NO.Monk :cal SetSyn("monk")<CR>
+an 50.70.210 &Syntax.Me-NO.Mplayer\ config :cal SetSyn("mplayerconf")<CR>
+an 50.70.220 &Syntax.Me-NO.MOO :cal SetSyn("moo")<CR>
+an 50.70.230 &Syntax.Me-NO.MS-DOS/Windows.4DOS\ \.bat\ file :cal SetSyn("btm")<CR>
+an 50.70.240 &Syntax.Me-NO.MS-DOS/Windows.\.bat\/\.cmd\ file :cal SetSyn("dosbatch")<CR>
+an 50.70.250 &Syntax.Me-NO.MS-DOS/Windows.\.ini\ file :cal SetSyn("dosini")<CR>
+an 50.70.260 &Syntax.Me-NO.MS-DOS/Windows.Module\ Definition :cal SetSyn("def")<CR>
+an 50.70.270 &Syntax.Me-NO.MS-DOS/Windows.Registry :cal SetSyn("registry")<CR>
+an 50.70.280 &Syntax.Me-NO.MS-DOS/Windows.Resource\ file :cal SetSyn("rc")<CR>
+an 50.70.290 &Syntax.Me-NO.Msql :cal SetSyn("msql")<CR>
+an 50.70.300 &Syntax.Me-NO.MuPAD :cal SetSyn("mupad")<CR>
+an 50.70.310 &Syntax.Me-NO.MUSHcode :cal SetSyn("mush")<CR>
+an 50.70.320 &Syntax.Me-NO.Muttrc :cal SetSyn("muttrc")<CR>
+an 50.70.340 &Syntax.Me-NO.Nanorc :cal SetSyn("nanorc")<CR>
+an 50.70.350 &Syntax.Me-NO.Nastran\ input/DMAP :cal SetSyn("nastran")<CR>
+an 50.70.360 &Syntax.Me-NO.Natural :cal SetSyn("natural")<CR>
+an 50.70.370 &Syntax.Me-NO.Netrc :cal SetSyn("netrc")<CR>
+an 50.70.380 &Syntax.Me-NO.Novell\ NCF\ batch :cal SetSyn("ncf")<CR>
+an 50.70.390 &Syntax.Me-NO.Not\ Quite\ C\ (LEGO) :cal SetSyn("nqc")<CR>
+an 50.70.400 &Syntax.Me-NO.Nroff :cal SetSyn("nroff")<CR>
+an 50.70.410 &Syntax.Me-NO.NSIS\ script :cal SetSyn("nsis")<CR>
+an 50.70.430 &Syntax.Me-NO.Objective\ C :cal SetSyn("objc")<CR>
+an 50.70.440 &Syntax.Me-NO.Objective\ C++ :cal SetSyn("objcpp")<CR>
+an 50.70.450 &Syntax.Me-NO.OCAML :cal SetSyn("ocaml")<CR>
+an 50.70.460 &Syntax.Me-NO.Occam :cal SetSyn("occam")<CR>
+an 50.70.470 &Syntax.Me-NO.Omnimark :cal SetSyn("omnimark")<CR>
+an 50.70.480 &Syntax.Me-NO.OpenROAD :cal SetSyn("openroad")<CR>
+an 50.70.490 &Syntax.Me-NO.Open\ Psion\ Lang :cal SetSyn("opl")<CR>
+an 50.70.500 &Syntax.Me-NO.Oracle\ config :cal SetSyn("ora")<CR>
+an 50.80.100 &Syntax.PQ.Packet\ filter\ conf :cal SetSyn("pf")<CR>
+an 50.80.110 &Syntax.PQ.Palm\ resource\ compiler :cal SetSyn("pilrc")<CR>
+an 50.80.120 &Syntax.PQ.Pam\ config :cal SetSyn("pamconf")<CR>
+an 50.80.130 &Syntax.PQ.PApp :cal SetSyn("papp")<CR>
+an 50.80.140 &Syntax.PQ.Pascal :cal SetSyn("pascal")<CR>
+an 50.80.150 &Syntax.PQ.Password\ file :cal SetSyn("passwd")<CR>
+an 50.80.160 &Syntax.PQ.PCCTS :cal SetSyn("pccts")<CR>
+an 50.80.170 &Syntax.PQ.PPWizard :cal SetSyn("ppwiz")<CR>
+an 50.80.180 &Syntax.PQ.Perl.Perl :cal SetSyn("perl")<CR>
+an 50.80.190 &Syntax.PQ.Perl.Perl\ POD :cal SetSyn("pod")<CR>
+an 50.80.200 &Syntax.PQ.Perl.Perl\ XS :cal SetSyn("xs")<CR>
+an 50.80.210 &Syntax.PQ.PHP.PHP\ 3-4 :cal SetSyn("php")<CR>
+an 50.80.220 &Syntax.PQ.PHP.Phtml\ (PHP\ 2) :cal SetSyn("phtml")<CR>
+an 50.80.230 &Syntax.PQ.Pike :cal SetSyn("pike")<CR>
+an 50.80.240 &Syntax.PQ.Pine\ RC :cal SetSyn("pine")<CR>
+an 50.80.250 &Syntax.PQ.Pinfo\ RC :cal SetSyn("pinfo")<CR>
+an 50.80.260 &Syntax.PQ.PL/M :cal SetSyn("plm")<CR>
+an 50.80.270 &Syntax.PQ.PL/SQL :cal SetSyn("plsql")<CR>
+an 50.80.280 &Syntax.PQ.PLP :cal SetSyn("plp")<CR>
+an 50.80.290 &Syntax.PQ.PO\ (GNU\ gettext) :cal SetSyn("po")<CR>
+an 50.80.300 &Syntax.PQ.Postfix\ main\ config :cal SetSyn("pfmain")<CR>
+an 50.80.310 &Syntax.PQ.PostScript.PostScript :cal SetSyn("postscr")<CR>
+an 50.80.320 &Syntax.PQ.PostScript.PostScript\ Printer\ Description :cal SetSyn("ppd")<CR>
+an 50.80.330 &Syntax.PQ.Povray.Povray\ scene\ descr :cal SetSyn("pov")<CR>
+an 50.80.340 &Syntax.PQ.Povray.Povray\ configuration :cal SetSyn("povini")<CR>
+an 50.80.350 &Syntax.PQ.Prescribe\ (Kyocera) :cal SetSyn("prescribe")<CR>
+an 50.80.360 &Syntax.PQ.Printcap :cal SetSyn("pcap")<CR>
+an 50.80.370 &Syntax.PQ.Procmail :cal SetSyn("procmail")<CR>
+an 50.80.380 &Syntax.PQ.Product\ Spec\ File :cal SetSyn("psf")<CR>
+an 50.80.390 &Syntax.PQ.Progress :cal SetSyn("progress")<CR>
+an 50.80.400 &Syntax.PQ.Prolog :cal SetSyn("prolog")<CR>
+an 50.80.410 &Syntax.PQ.Protocols :cal SetSyn("protocols")<CR>
+an 50.80.420 &Syntax.PQ.Purify\ log :cal SetSyn("purifylog")<CR>
+an 50.80.430 &Syntax.PQ.Pyrex :cal SetSyn("pyrex")<CR>
+an 50.80.440 &Syntax.PQ.Python :cal SetSyn("python")<CR>
+an 50.80.460 &Syntax.PQ.Quake :cal SetSyn("quake")<CR>
+an 50.80.470 &Syntax.PQ.Quickfix\ window :cal SetSyn("qf")<CR>
 an 50.90.100 &Syntax.R-Sg.R :cal SetSyn("r")<CR>
-an 50.90.110 &Syntax.R-Sg.Radiance :cal SetSyn("radiance")<CR>
-an 50.90.120 &Syntax.R-Sg.Ratpoison :cal SetSyn("ratpoison")<CR>
-an 50.90.130 &Syntax.R-Sg.RCS.RCS\ log\ output :cal SetSyn("rcslog")<CR>
-an 50.90.140 &Syntax.R-Sg.RCS.RCS\ file :cal SetSyn("rcs")<CR>
-an 50.90.150 &Syntax.R-Sg.Readline\ config :cal SetSyn("readline")<CR>
-an 50.90.160 &Syntax.R-Sg.Rebol :cal SetSyn("rebol")<CR>
-an 50.90.170 &Syntax.R-Sg.Remind :cal SetSyn("remind")<CR>
-an 50.90.180 &Syntax.R-Sg.Relax\ NG\ compact :cal SetSyn("rnc")<CR>
-an 50.90.190 &Syntax.R-Sg.Renderman.Renderman\ Shader\ Lang :cal SetSyn("sl")<CR>
-an 50.90.200 &Syntax.R-Sg.Renderman.Renderman\ Interface\ Bytestream :cal SetSyn("rib")<CR>
-an 50.90.210 &Syntax.R-Sg.Resolv\.conf :cal SetSyn("resolv")<CR>
-an 50.90.220 &Syntax.R-Sg.Rexx :cal SetSyn("rexx")<CR>
-an 50.90.230 &Syntax.R-Sg.Robots\.txt :cal SetSyn("robots")<CR>
-an 50.90.240 &Syntax.R-Sg.RockLinux\ package\ desc\. :cal SetSyn("desc")<CR>
-an 50.90.250 &Syntax.R-Sg.Rpcgen :cal SetSyn("rpcgen")<CR>
-an 50.90.260 &Syntax.R-Sg.RPL/2 :cal SetSyn("rpl")<CR>
-an 50.90.270 &Syntax.R-Sg.ReStructuredText :cal SetSyn("rst")<CR>
-an 50.90.280 &Syntax.R-Sg.RTF :cal SetSyn("rtf")<CR>
-an 50.90.290 &Syntax.R-Sg.Ruby :cal SetSyn("ruby")<CR>
-an 50.90.310 &Syntax.R-Sg.S-Lang :cal SetSyn("slang")<CR>
-an 50.90.320 &Syntax.R-Sg.Samba\ config :cal SetSyn("samba")<CR>
-an 50.90.330 &Syntax.R-Sg.SAS :cal SetSyn("sas")<CR>
-an 50.90.340 &Syntax.R-Sg.Sather :cal SetSyn("sather")<CR>
-an 50.90.350 &Syntax.R-Sg.Scheme :cal SetSyn("scheme")<CR>
-an 50.90.360 &Syntax.R-Sg.Scilab :cal SetSyn("scilab")<CR>
-an 50.90.370 &Syntax.R-Sg.Screen\ RC :cal SetSyn("screen")<CR>
-an 50.90.380 &Syntax.R-Sg.SDL :cal SetSyn("sdl")<CR>
-an 50.90.390 &Syntax.R-Sg.Sed :cal SetSyn("sed")<CR>
-an 50.90.400 &Syntax.R-Sg.Sendmail\.cf :cal SetSyn("sm")<CR>
-an 50.90.410 &Syntax.R-Sg.Send-pr :cal SetSyn("sendpr")<CR>
-an 50.90.420 &Syntax.R-Sg.SGML.SGML\ catalog :cal SetSyn("catalog")<CR>
-an 50.90.430 &Syntax.R-Sg.SGML.SGML\ DTD :cal SetSyn("sgml")<CR>
-an 50.90.440 &Syntax.R-Sg.SGML.SGML\ Declaration :cal SetSyn("sgmldecl")<CR>
-an 50.90.450 &Syntax.R-Sg.SGML.SGML-linuxdoc :cal SetSyn("sgmllnx")<CR>
+an 50.90.110 &Syntax.R-Sg.R\ help :cal SetSyn("rhelp")<CR>
+an 50.90.120 &Syntax.R-Sg.Racc\ input :cal SetSyn("racc")<CR>
+an 50.90.130 &Syntax.R-Sg.Radiance :cal SetSyn("radiance")<CR>
+an 50.90.140 &Syntax.R-Sg.Ratpoison :cal SetSyn("ratpoison")<CR>
+an 50.90.150 &Syntax.R-Sg.RCS.RCS\ log\ output :cal SetSyn("rcslog")<CR>
+an 50.90.160 &Syntax.R-Sg.RCS.RCS\ file :cal SetSyn("rcs")<CR>
+an 50.90.170 &Syntax.R-Sg.Readline\ config :cal SetSyn("readline")<CR>
+an 50.90.180 &Syntax.R-Sg.Rebol :cal SetSyn("rebol")<CR>
+an 50.90.190 &Syntax.R-Sg.Remind :cal SetSyn("remind")<CR>
+an 50.90.200 &Syntax.R-Sg.Relax\ NG\ compact :cal SetSyn("rnc")<CR>
+an 50.90.210 &Syntax.R-Sg.Renderman.Renderman\ Shader\ Lang :cal SetSyn("sl")<CR>
+an 50.90.220 &Syntax.R-Sg.Renderman.Renderman\ Interface\ Bytestream :cal SetSyn("rib")<CR>
+an 50.90.230 &Syntax.R-Sg.Resolv\.conf :cal SetSyn("resolv")<CR>
+an 50.90.240 &Syntax.R-Sg.Rexx :cal SetSyn("rexx")<CR>
+an 50.90.250 &Syntax.R-Sg.Robots\.txt :cal SetSyn("robots")<CR>
+an 50.90.260 &Syntax.R-Sg.RockLinux\ package\ desc\. :cal SetSyn("desc")<CR>
+an 50.90.270 &Syntax.R-Sg.Rpcgen :cal SetSyn("rpcgen")<CR>
+an 50.90.280 &Syntax.R-Sg.RPL/2 :cal SetSyn("rpl")<CR>
+an 50.90.290 &Syntax.R-Sg.ReStructuredText :cal SetSyn("rst")<CR>
+an 50.90.300 &Syntax.R-Sg.RTF :cal SetSyn("rtf")<CR>
+an 50.90.310 &Syntax.R-Sg.Ruby :cal SetSyn("ruby")<CR>
+an 50.90.330 &Syntax.R-Sg.S-Lang :cal SetSyn("slang")<CR>
+an 50.90.340 &Syntax.R-Sg.Samba\ config :cal SetSyn("samba")<CR>
+an 50.90.350 &Syntax.R-Sg.SAS :cal SetSyn("sas")<CR>
+an 50.90.360 &Syntax.R-Sg.Sather :cal SetSyn("sather")<CR>
+an 50.90.370 &Syntax.R-Sg.Scheme :cal SetSyn("scheme")<CR>
+an 50.90.380 &Syntax.R-Sg.Scilab :cal SetSyn("scilab")<CR>
+an 50.90.390 &Syntax.R-Sg.Screen\ RC :cal SetSyn("screen")<CR>
+an 50.90.400 &Syntax.R-Sg.SDL :cal SetSyn("sdl")<CR>
+an 50.90.410 &Syntax.R-Sg.Sed :cal SetSyn("sed")<CR>
+an 50.90.420 &Syntax.R-Sg.Sendmail\.cf :cal SetSyn("sm")<CR>
+an 50.90.430 &Syntax.R-Sg.Send-pr :cal SetSyn("sendpr")<CR>
+an 50.90.440 &Syntax.R-Sg.Sensors\.conf :cal SetSyn("sensors")<CR>
+an 50.90.450 &Syntax.R-Sg.Service\ Location\ config :cal SetSyn("slpconf")<CR>
+an 50.90.460 &Syntax.R-Sg.Service\ Location\ registration :cal SetSyn("slpreg")<CR>
+an 50.90.470 &Syntax.R-Sg.Service\ Location\ SPI :cal SetSyn("slpspi")<CR>
+an 50.90.480 &Syntax.R-Sg.Services :cal SetSyn("services")<CR>
+an 50.90.490 &Syntax.R-Sg.Setserial\ config :cal SetSyn("setserial")<CR>
+an 50.90.500 &Syntax.R-Sg.SGML.SGML\ catalog :cal SetSyn("catalog")<CR>
+an 50.90.510 &Syntax.R-Sg.SGML.SGML\ DTD :cal SetSyn("sgml")<CR>
+an 50.90.520 &Syntax.R-Sg.SGML.SGML\ Declaration :cal SetSyn("sgmldecl")<CR>
+an 50.90.530 &Syntax.R-Sg.SGML.SGML-linuxdoc :cal SetSyn("sgmllnx")<CR>
 an 50.100.100 &Syntax.Sh-S.Shell\ script.sh\ and\ ksh :cal SetSyn("sh")<CR>
 an 50.100.110 &Syntax.Sh-S.Shell\ script.csh :cal SetSyn("csh")<CR>
 an 50.100.120 &Syntax.Sh-S.Shell\ script.tcsh :cal SetSyn("tcsh")<CR>
@@ -367,17 +405,21 @@ an 50.100.410 &Syntax.Sh-S.Squid\ config :cal SetSyn("squid")<CR>
 an 50.100.420 &Syntax.Sh-S.SQL.ESQL-C :cal SetSyn("esqlc")<CR>
 an 50.100.430 &Syntax.Sh-S.SQL.MySQL :cal SetSyn("mysql")<CR>
 an 50.100.440 &Syntax.Sh-S.SQL.PL/SQL :cal SetSyn("plsql")<CR>
-an 50.100.450 &Syntax.Sh-S.SQL.SQL\ (Oracle) :cal SetSyn("sql")<CR>
-an 50.100.460 &Syntax.Sh-S.SQL.SQL\ Forms :cal SetSyn("sqlforms")<CR>
-an 50.100.470 &Syntax.Sh-S.SQL.SQLJ :cal SetSyn("sqlj")<CR>
-an 50.100.480 &Syntax.Sh-S.SQL.SQL-Informix :cal SetSyn("sqlinformix")<CR>
-an 50.100.490 &Syntax.Sh-S.SQR :cal SetSyn("sqr")<CR>
-an 50.100.500 &Syntax.Sh-S.Ssh.ssh_config :cal SetSyn("sshconfig")<CR>
-an 50.100.510 &Syntax.Sh-S.Ssh.sshd_config :cal SetSyn("sshdconfig")<CR>
-an 50.100.520 &Syntax.Sh-S.Standard\ ML :cal SetSyn("sml")<CR>
-an 50.100.530 &Syntax.Sh-S.Stored\ Procedures :cal SetSyn("stp")<CR>
-an 50.100.540 &Syntax.Sh-S.Strace :cal SetSyn("strace")<CR>
-an 50.100.550 &Syntax.Sh-S.Subversion\ commit :cal SetSyn("svn")<CR>
+an 50.100.450 &Syntax.Sh-S.SQL.SQL\ Anywhere :cal SetSyn("sqlanywhere")<CR>
+an 50.100.460 &Syntax.Sh-S.SQL.SQL\ (automatic) :cal SetSyn("sql")<CR>
+an 50.100.470 &Syntax.Sh-S.SQL.SQL\ (Oracle) :cal SetSyn("sqloracle")<CR>
+an 50.100.480 &Syntax.Sh-S.SQL.SQL\ Forms :cal SetSyn("sqlforms")<CR>
+an 50.100.490 &Syntax.Sh-S.SQL.SQLJ :cal SetSyn("sqlj")<CR>
+an 50.100.500 &Syntax.Sh-S.SQL.SQL-Informix :cal SetSyn("sqlinformix")<CR>
+an 50.100.510 &Syntax.Sh-S.SQR :cal SetSyn("sqr")<CR>
+an 50.100.520 &Syntax.Sh-S.Ssh.ssh_config :cal SetSyn("sshconfig")<CR>
+an 50.100.530 &Syntax.Sh-S.Ssh.sshd_config :cal SetSyn("sshdconfig")<CR>
+an 50.100.540 &Syntax.Sh-S.Standard\ ML :cal SetSyn("sml")<CR>
+an 50.100.550 &Syntax.Sh-S.Stored\ Procedures :cal SetSyn("stp")<CR>
+an 50.100.560 &Syntax.Sh-S.Strace :cal SetSyn("strace")<CR>
+an 50.100.570 &Syntax.Sh-S.Subversion\ commit :cal SetSyn("svn")<CR>
+an 50.100.580 &Syntax.Sh-S.Sudoers :cal SetSyn("sudoers")<CR>
+an 50.100.590 &Syntax.Sh-S.Sysctl\.conf :cal SetSyn("sysctl")<CR>
 an 50.110.100 &Syntax.TUV.TADS :cal SetSyn("tads")<CR>
 an 50.110.110 &Syntax.TUV.Tags :cal SetSyn("tags")<CR>
 an 50.110.120 &Syntax.TUV.TAK.TAK\ compare :cal SetSyn("takcmp")<CR>
@@ -396,22 +438,28 @@ an 50.110.240 &Syntax.TUV.Tidy\ configuration :cal SetSyn("tidy")<CR>
 an 50.110.250 &Syntax.TUV.Tilde :cal SetSyn("tilde")<CR>
 an 50.110.260 &Syntax.TUV.TPP :cal SetSyn("tpp")<CR>
 an 50.110.270 &Syntax.TUV.Trasys\ input :cal SetSyn("trasys")<CR>
-an 50.110.280 &Syntax.TUV.TSS.Command\ Line :cal SetSyn("tsscl")<CR>
-an 50.110.290 &Syntax.TUV.TSS.Geometry :cal SetSyn("tssgm")<CR>
-an 50.110.300 &Syntax.TUV.TSS.Optics :cal SetSyn("tssop")<CR>
-an 50.110.320 &Syntax.TUV.UIT/UIL :cal SetSyn("uil")<CR>
-an 50.110.330 &Syntax.TUV.UnrealScript :cal SetSyn("uc")<CR>
-an 50.110.350 &Syntax.TUV.Valgrind :cal SetSyn("valgrind")<CR>
-an 50.110.360 &Syntax.TUV.Verilog\ HDL :cal SetSyn("verilog")<CR>
-an 50.110.370 &Syntax.TUV.Vgrindefs :cal SetSyn("vgrindefs")<CR>
-an 50.110.380 &Syntax.TUV.VHDL :cal SetSyn("vhdl")<CR>
-an 50.110.390 &Syntax.TUV.Vim.Vim\ help\ file :cal SetSyn("help")<CR>
-an 50.110.400 &Syntax.TUV.Vim.Vim\ script :cal SetSyn("vim")<CR>
-an 50.110.410 &Syntax.TUV.Vim.Viminfo\ file :cal SetSyn("viminfo")<CR>
-an 50.110.420 &Syntax.TUV.Virata\ config :cal SetSyn("virata")<CR>
-an 50.110.430 &Syntax.TUV.Visual\ Basic :cal SetSyn("vb")<CR>
-an 50.110.440 &Syntax.TUV.VRML :cal SetSyn("vrml")<CR>
-an 50.110.450 &Syntax.TUV.VSE\ JCL :cal SetSyn("vsejcl")<CR>
+an 50.110.280 &Syntax.TUV.Trustees :cal SetSyn("trustees")<CR>
+an 50.110.290 &Syntax.TUV.TSS.Command\ Line :cal SetSyn("tsscl")<CR>
+an 50.110.300 &Syntax.TUV.TSS.Geometry :cal SetSyn("tssgm")<CR>
+an 50.110.310 &Syntax.TUV.TSS.Optics :cal SetSyn("tssop")<CR>
+an 50.110.330 &Syntax.TUV.Udev\ config :cal SetSyn("udevconf")<CR>
+an 50.110.340 &Syntax.TUV.Udev\ permissions :cal SetSyn("udevperm")<CR>
+an 50.110.350 &Syntax.TUV.Udev\ rules :cal SetSyn("udevrules")<CR>
+an 50.110.360 &Syntax.TUV.UIT/UIL :cal SetSyn("uil")<CR>
+an 50.110.370 &Syntax.TUV.UnrealScript :cal SetSyn("uc")<CR>
+an 50.110.380 &Syntax.TUV.Updatedb\.conf :cal SetSyn("updatedb")<CR>
+an 50.110.400 &Syntax.TUV.Valgrind :cal SetSyn("valgrind")<CR>
+an 50.110.410 &Syntax.TUV.Verilog-AMS\ HDL :cal SetSyn("verilogams")<CR>
+an 50.110.420 &Syntax.TUV.Verilog\ HDL :cal SetSyn("verilog")<CR>
+an 50.110.430 &Syntax.TUV.Vgrindefs :cal SetSyn("vgrindefs")<CR>
+an 50.110.440 &Syntax.TUV.VHDL :cal SetSyn("vhdl")<CR>
+an 50.110.450 &Syntax.TUV.Vim.Vim\ help\ file :cal SetSyn("help")<CR>
+an 50.110.460 &Syntax.TUV.Vim.Vim\ script :cal SetSyn("vim")<CR>
+an 50.110.470 &Syntax.TUV.Vim.Viminfo\ file :cal SetSyn("viminfo")<CR>
+an 50.110.480 &Syntax.TUV.Virata\ config :cal SetSyn("virata")<CR>
+an 50.110.490 &Syntax.TUV.Visual\ Basic :cal SetSyn("vb")<CR>
+an 50.110.500 &Syntax.TUV.VRML :cal SetSyn("vrml")<CR>
+an 50.110.510 &Syntax.TUV.VSE\ JCL :cal SetSyn("vsejcl")<CR>
 an 50.120.100 &Syntax.WXYZ.WEB.CWEB :cal SetSyn("cweb")<CR>
 an 50.120.110 &Syntax.WXYZ.WEB.WEB :cal SetSyn("web")<CR>
 an 50.120.120 &Syntax.WXYZ.WEB.WEB\ Changes :cal SetSyn("change")<CR>
@@ -423,19 +471,22 @@ an 50.120.190 &Syntax.WXYZ.Whitespace\ (add) :cal SetSyn("whitespace")<CR>
 an 50.120.200 &Syntax.WXYZ.WildPackets\ EtherPeek\ Decoder :cal SetSyn("dcd")<CR>
 an 50.120.210 &Syntax.WXYZ.WinBatch/Webbatch :cal SetSyn("winbatch")<CR>
 an 50.120.220 &Syntax.WXYZ.Windows\ Scripting\ Host :cal SetSyn("wsh")<CR>
-an 50.120.230 &Syntax.WXYZ.WvDial :cal SetSyn("wvdial")<CR>
-an 50.120.250 &Syntax.WXYZ.X\ Keyboard\ Extension :cal SetSyn("xkb")<CR>
-an 50.120.260 &Syntax.WXYZ.X\ Pixmap :cal SetSyn("xpm")<CR>
-an 50.120.270 &Syntax.WXYZ.X\ Pixmap\ (2) :cal SetSyn("xpm2")<CR>
-an 50.120.280 &Syntax.WXYZ.X\ resources :cal SetSyn("xdefaults")<CR>
-an 50.120.290 &Syntax.WXYZ.Xmodmap :cal SetSyn("xmodmap")<CR>
-an 50.120.300 &Syntax.WXYZ.Xmath :cal SetSyn("xmath")<CR>
-an 50.120.310 &Syntax.WXYZ.XML :cal SetSyn("xml")<CR>
-an 50.120.320 &Syntax.WXYZ.XML\ Schema\ (XSD) :cal SetSyn("xsd")<CR>
-an 50.120.330 &Syntax.WXYZ.Xslt :cal SetSyn("xslt")<CR>
-an 50.120.340 &Syntax.WXYZ.XFree86\ Config :cal SetSyn("xf86conf")<CR>
-an 50.120.360 &Syntax.WXYZ.YAML :cal SetSyn("yaml")<CR>
-an 50.120.370 &Syntax.WXYZ.Yacc :cal SetSyn("yacc")<CR>
+an 50.120.230 &Syntax.WXYZ.WSML :cal SetSyn("wsml")<CR>
+an 50.120.240 &Syntax.WXYZ.WvDial :cal SetSyn("wvdial")<CR>
+an 50.120.260 &Syntax.WXYZ.X\ Keyboard\ Extension :cal SetSyn("xkb")<CR>
+an 50.120.270 &Syntax.WXYZ.X\ Pixmap :cal SetSyn("xpm")<CR>
+an 50.120.280 &Syntax.WXYZ.X\ Pixmap\ (2) :cal SetSyn("xpm2")<CR>
+an 50.120.290 &Syntax.WXYZ.X\ resources :cal SetSyn("xdefaults")<CR>
+an 50.120.300 &Syntax.WXYZ.Xinetd\.conf :cal SetSyn("xinetd")<CR>
+an 50.120.310 &Syntax.WXYZ.Xmodmap :cal SetSyn("xmodmap")<CR>
+an 50.120.320 &Syntax.WXYZ.Xmath :cal SetSyn("xmath")<CR>
+an 50.120.330 &Syntax.WXYZ.XML :cal SetSyn("xml")<CR>
+an 50.120.340 &Syntax.WXYZ.XML\ Schema\ (XSD) :cal SetSyn("xsd")<CR>
+an 50.120.350 &Syntax.WXYZ.XQuery :cal SetSyn("xquery")<CR>
+an 50.120.360 &Syntax.WXYZ.Xslt :cal SetSyn("xslt")<CR>
+an 50.120.370 &Syntax.WXYZ.XFree86\ Config :cal SetSyn("xf86conf")<CR>
+an 50.120.390 &Syntax.WXYZ.YAML :cal SetSyn("yaml")<CR>
+an 50.120.400 &Syntax.WXYZ.Yacc :cal SetSyn("yacc")<CR>

 " The End Of The Syntax Menu

--- a/runtime/syntax/groovy.vim
+++ b/runtime/syntax/groovy.vim
@@ -0,0 +1,450 @@
+" Vim syntax file
+" Language:	Groovy
+" Maintainer:	Alessio Pace <billy.corgan@tiscali.it>
+" Version: 	0.1.9b
+" URL:	  http://www.vim.org/scripts/script.php?script_id=945	
+" Last Change:	6/4/2004
+
+" This is my very first vim script, I hope to have
+" done it the right way.
+" 
+" I must directly or indirectly thank the author of java.vim and ruby.vim:
+" I copied from them most of the stuff :-)
+"
+" Relies on html.vim
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+"
+" HOWTO USE IT (INSTALL):
+" [groovy is still not recognized by vim! :-( ]
+"
+" 1) copy the file in the (global or user's $HOME/.vim/syntax/) syntax folder
+" 
+" 2) add this line to recognize groovy files by filename extension:
+"
+" au BufNewFile,BufRead *.groovy  setf groovy
+" in the global vim filetype.vim file or inside $HOME/.vim/filetype.vim
+"
+" 3) add this part to recognize by content groovy script (no extension needed :-)
+"
+"  if did_filetype()
+"    finish
+"  endif
+"  if getline(1) =~ '^#!.*[/\\]groovy\>'
+"    setf groovy
+"  endif
+"
+"  in the global scripts.vim file or in $HOME/.vim/scripts.vim
+" 
+" 4) open/write a .groovy file or a groovy script :-)
+"
+" Let me know if you like it or send me patches, so that I can improve it
+" when I have time
+
+" Quit when a syntax file was already loaded
+if !exists("main_syntax")
+  if version < 600
+    syntax clear
+  elseif exists("b:current_syntax")
+    finish
+  endif
+  " we define it here so that included files can test for it
+  let main_syntax='groovy'
+endif
+
+" don't use standard HiLink, it will not work with included syntax files
+if version < 508
+  command! -nargs=+ GroovyHiLink hi link <args>
+else
+  command! -nargs=+ GroovyHiLink hi def link <args>
+endif
+
+" ##########################
+" Java stuff taken from java.vim
+" some characters that cannot be in a groovy program (outside a string)
+" syn match groovyError "[\\@`]"
+"syn match groovyError "<<<\|\.\.\|=>\|<>\|||=\|&&=\|[^-]->\|\*\/"
+"syn match groovyOK "\.\.\."
+
+" keyword definitions
+syn keyword groovyExternal        native package
+syn match groovyExternal          "\<import\(\s\+static\>\)\?"
+syn keyword groovyError           goto const
+syn keyword groovyConditional     if else switch
+syn keyword groovyRepeat          while for do
+syn keyword groovyBoolean         true false
+syn keyword groovyConstant        null
+syn keyword groovyTypedef         this super
+syn keyword groovyOperator        new instanceof
+syn keyword groovyType            boolean char byte short int long float double
+syn keyword groovyType            void
+syn keyword groovyType		  Integer Double Date Boolean Float String Array Vector List
+syn keyword groovyStatement       return
+syn keyword groovyStorageClass    static synchronized transient volatile final strictfp serializable
+syn keyword groovyExceptions      throw try catch finally
+syn keyword groovyAssert          assert
+syn keyword groovyMethodDecl      synchronized throws
+syn keyword groovyClassDecl       extends implements interface
+" to differentiate the keyword class from MyClass.class we use a match here
+syn match   groovyTypedef         "\.\s*\<class\>"ms=s+1
+syn keyword groovyClassDecl         enum
+syn match   groovyClassDecl       "^class\>"
+syn match   groovyClassDecl       "[^.]\s*\<class\>"ms=s+1
+syn keyword groovyBranch          break continue nextgroup=groovyUserLabelRef skipwhite
+syn match   groovyUserLabelRef    "\k\+" contained
+syn keyword groovyScopeDecl       public protected private abstract
+
+
+if exists("groovy_highlight_groovy_lang_ids") || exists("groovy_highlight_groovy_lang") || exists("groovy_highlight_all")
+  " groovy.lang.*
+  syn keyword groovyLangClass  Closure MetaMethod GroovyObject
+  
+  syn match groovyJavaLangClass "\<System\>"
+  syn keyword groovyJavaLangClass  Cloneable Comparable Runnable Serializable Boolean Byte Class Object
+  syn keyword groovyJavaLangClass  Character CharSequence ClassLoader Compiler
+  " syn keyword groovyJavaLangClass  Integer Double Float Long 
+  syn keyword groovyJavaLangClass  InheritableThreadLocal Math Number Object Package Process
+  syn keyword groovyJavaLangClass  Runtime RuntimePermission InheritableThreadLocal
+  syn keyword groovyJavaLangClass  SecurityManager Short StrictMath StackTraceElement
+  syn keyword groovyJavaLangClass  StringBuffer Thread ThreadGroup
+  syn keyword groovyJavaLangClass  ThreadLocal Throwable Void ArithmeticException
+  syn keyword groovyJavaLangClass  ArrayIndexOutOfBoundsException AssertionError
+  syn keyword groovyJavaLangClass  ArrayStoreException ClassCastException
+  syn keyword groovyJavaLangClass  ClassNotFoundException
+  syn keyword groovyJavaLangClass  CloneNotSupportedException Exception
+  syn keyword groovyJavaLangClass  IllegalAccessException
+  syn keyword groovyJavaLangClass  IllegalArgumentException
+  syn keyword groovyJavaLangClass  IllegalMonitorStateException
+  syn keyword groovyJavaLangClass  IllegalStateException
+  syn keyword groovyJavaLangClass  IllegalThreadStateException
+  syn keyword groovyJavaLangClass  IndexOutOfBoundsException
+  syn keyword groovyJavaLangClass  InstantiationException InterruptedException
+  syn keyword groovyJavaLangClass  NegativeArraySizeException NoSuchFieldException
+  syn keyword groovyJavaLangClass  NoSuchMethodException NullPointerException
+  syn keyword groovyJavaLangClass  NumberFormatException RuntimeException
+  syn keyword groovyJavaLangClass  SecurityException StringIndexOutOfBoundsException
+  syn keyword groovyJavaLangClass  UnsupportedOperationException
+  syn keyword groovyJavaLangClass  AbstractMethodError ClassCircularityError
+  syn keyword groovyJavaLangClass  ClassFormatError Error ExceptionInInitializerError
+  syn keyword groovyJavaLangClass  IllegalAccessError InstantiationError
+  syn keyword groovyJavaLangClass  IncompatibleClassChangeError InternalError
+  syn keyword groovyJavaLangClass  LinkageError NoClassDefFoundError
+  syn keyword groovyJavaLangClass  NoSuchFieldError NoSuchMethodError
+  syn keyword groovyJavaLangClass  OutOfMemoryError StackOverflowError
+  syn keyword groovyJavaLangClass  ThreadDeath UnknownError UnsatisfiedLinkError
+  syn keyword groovyJavaLangClass  UnsupportedClassVersionError VerifyError
+  syn keyword groovyJavaLangClass  VirtualMachineError
+
+  syn keyword groovyJavaLangObject clone equals finalize getClass hashCode
+  syn keyword groovyJavaLangObject notify notifyAll toString wait
+
+  GroovyHiLink groovyLangClass                   groovyConstant
+  GroovyHiLink groovyJavaLangClass               groovyExternal
+  GroovyHiLink groovyJavaLangObject              groovyConstant
+  syn cluster groovyTop add=groovyJavaLangObject,groovyJavaLangClass,groovyLangClass
+  syn cluster groovyClasses add=groovyJavaLangClass,groovyLangClass
+endif
+
+
+" Groovy stuff
+syn match groovyOperator "\.\."
+syn match groovyOperator "<\{2,3}"
+syn match groovyOperator ">\{2,3}"
+syn match groovyOperator "->"
+syn match groovyExternal		'^#!.*[/\\]groovy\>'
+syn match groovyExceptions        "\<Exception\>\|\<[A-Z]\{1,}[a-zA-Z0-9]*Exception\>"
+
+" Groovy JDK stuff
+syn keyword groovyJDKBuiltin    as def in
+syn keyword groovyJDKOperOverl  div minus plus abs round power multiply 
+syn keyword groovyJDKMethods 	each call inject sort print println 
+syn keyword groovyJDKMethods    getAt putAt size push pop toList getText writeLine eachLine readLines
+syn keyword groovyJDKMethods    withReader withStream withWriter withPrintWriter write read leftShift 
+syn keyword groovyJDKMethods    withWriterAppend readBytes splitEachLine
+syn keyword groovyJDKMethods    newInputStream newOutputStream newPrintWriter newReader newWriter 
+syn keyword groovyJDKMethods    compareTo next previous isCase 
+syn keyword groovyJDKMethods    times step toInteger upto any collect dump every find findAll grep
+syn keyword groovyJDKMethods    inspect invokeMethods join 
+syn keyword groovyJDKMethods    getErr getIn getOut waitForOrKill
+syn keyword groovyJDKMethods    count tokenize asList flatten immutable intersect reverse reverseEach
+syn keyword groovyJDKMethods    subMap append asWritable eachByte eachLine eachFile 
+syn cluster groovyTop add=groovyJDKBuiltin,groovyJDKOperOverl,groovyJDKMethods
+
+" no useful I think, so I comment it..
+"if filereadable(expand("<sfile>:p:h")."/groovyid.vim")
+ " source <sfile>:p:h/groovyid.vim
+"endif
+
+if exists("groovy_space_errors")
+  if !exists("groovy_no_trail_space_error")
+    syn match   groovySpaceError  "\s\+$"
+  endif
+  if !exists("groovy_no_tab_space_error")
+    syn match   groovySpaceError  " \+\t"me=e-1
+  endif
+endif
+
+" it is a better case construct than java.vim to match groovy syntax
+syn region  groovyLabelRegion     transparent matchgroup=groovyLabel start="\<case\>" matchgroup=NONE end=":\|$" contains=groovyNumber,groovyString,groovyLangClass,groovyJavaLangClass
+syn match   groovyUserLabel       "^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=groovyLabel
+syn keyword groovyLabel           default
+
+if !exists("groovy_allow_cpp_keywords")
+  syn keyword groovyError auto delete extern friend inline redeclared
+  syn keyword groovyError register signed sizeof struct template typedef union
+  syn keyword groovyError unsigned operator
+endif
+
+" The following cluster contains all groovy groups except the contained ones
+syn cluster groovyTop add=groovyExternal,groovyError,groovyError,groovyBranch,groovyLabelRegion,groovyLabel,groovyConditional,groovyRepeat,groovyBoolean,groovyConstant,groovyTypedef,groovyOperator,groovyType,groovyType,groovyStatement,groovyStorageClass,groovyAssert,groovyExceptions,groovyMethodDecl,groovyClassDecl,groovyClassDecl,groovyClassDecl,groovyScopeDecl,groovyError,groovyError2,groovyUserLabel,groovyLangObject
+
+
+" Comments
+syn keyword groovyTodo             contained TODO FIXME XXX
+if exists("groovy_comment_strings")
+  syn region  groovyCommentString    contained start=+"+ end=+"+ end=+$+ end=+\*/+me=s-1,he=s-1 contains=groovySpecial,groovyCommentStar,groovySpecialChar,@Spell
+  syn region  groovyComment2String   contained start=+"+  end=+$\|"+  contains=groovySpecial,groovySpecialChar,@Spell
+  syn match   groovyCommentCharacter contained "'\\[^']\{1,6\}'" contains=groovySpecialChar
+  syn match   groovyCommentCharacter contained "'\\''" contains=groovySpecialChar
+  syn match   groovyCommentCharacter contained "'[^\\]'"
+  syn cluster groovyCommentSpecial add=groovyCommentString,groovyCommentCharacter,groovyNumber
+  syn cluster groovyCommentSpecial2 add=groovyComment2String,groovyCommentCharacter,groovyNumber
+endif
+syn region  groovyComment          start="/\*"  end="\*/" contains=@groovyCommentSpecial,groovyTodo,@Spell
+syn match   groovyCommentStar      contained "^\s*\*[^/]"me=e-1
+syn match   groovyCommentStar      contained "^\s*\*$"
+syn match   groovyLineComment      "//.*" contains=@groovyCommentSpecial2,groovyTodo,@Spell
+syn match   groovyLineComment      "#.*" contains=@groovyCommentSpecial2,groovyTodo,@Spell
+GroovyHiLink groovyCommentString groovyString
+GroovyHiLink groovyComment2String groovyString
+GroovyHiLink groovyCommentCharacter groovyCharacter
+
+syn cluster groovyTop add=groovyComment,groovyLineComment
+
+if !exists("groovy_ignore_groovydoc") && main_syntax != 'jsp'
+  syntax case ignore
+  " syntax coloring for groovydoc comments (HTML)
+  " syntax include @groovyHtml <sfile>:p:h/html.vim
+   syntax include @groovyHtml runtime! syntax/html.vim
+  unlet b:current_syntax
+  syn region  groovyDocComment    start="/\*\*"  end="\*/" keepend contains=groovyCommentTitle,@groovyHtml,groovyDocTags,groovyTodo,@Spell
+  syn region  groovyCommentTitle  contained matchgroup=groovyDocComment start="/\*\*"   matchgroup=groovyCommentTitle keepend end="\.$" end="\.[ \t\r<&]"me=e-1 end="[^{]@"me=s-2,he=s-1 end="\*/"me=s-1,he=s-1 contains=@groovyHtml,groovyCommentStar,groovyTodo,@Spell,groovyDocTags
+
+  syn region groovyDocTags  contained start="{@\(link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}"
+  syn match  groovyDocTags  contained "@\(see\|param\|exception\|throws\|since\)\s\+\S\+" contains=groovyDocParam
+  syn match  groovyDocParam contained "\s\S\+"
+  syn match  groovyDocTags  contained "@\(version\|author\|return\|deprecated\|serial\|serialField\|serialData\)\>"
+  syntax case match
+endif
+
+" match the special comment /**/
+syn match   groovyComment          "/\*\*/"
+
+" Strings and constants
+syn match   groovySpecialError     contained "\\."
+syn match   groovySpecialCharError contained "[^']"
+syn match   groovySpecialChar      contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\)"
+syn region  groovyString          start=+"+ end=+"+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr
+syn region  groovyString          start=+'+ end=+'+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr
+" syn region groovyELExpr start=+${+ end=+}+ keepend contained
+ syn match groovyELExpr /\${.\{-}}/ contained
+GroovyHiLink groovyELExpr Identifier
+
+" TODO: better matching. I am waiting to understand how it really works in groovy
+" syn region  groovyClosureParamsBraces          start=+|+ end=+|+ contains=groovyClosureParams
+" syn match groovyClosureParams	"[ a-zA-Z0-9_*]\+" contained
+" GroovyHiLink groovyClosureParams Identifier
+
+" next line disabled, it can cause a crash for a long line
+"syn match   groovyStringError      +"\([^"\\]\|\\.\)*$+
+
+" disabled: in groovy strings or characters are written the same
+" syn match   groovyCharacter        "'[^']*'" contains=groovySpecialChar,groovySpecialCharError
+" syn match   groovyCharacter        "'\\''" contains=groovySpecialChar
+" syn match   groovyCharacter        "'[^\\]'"
+syn match   groovyNumber           "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
+syn match   groovyNumber           "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
+syn match   groovyNumber           "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
+syn match   groovyNumber           "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
+
+" unicode characters
+syn match   groovySpecial "\\u\d\{4\}"
+
+syn cluster groovyTop add=groovyString,groovyCharacter,groovyNumber,groovySpecial,groovyStringError
+
+if exists("groovy_highlight_functions")
+  if groovy_highlight_functions == "indent"
+    syn match  groovyFuncDef "^\(\t\| \{8\}\)[_$a-zA-Z][_$a-zA-Z0-9_. \[\]]*([^-+*/()]*)" contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+    syn region groovyFuncDef start=+^\(\t\| \{8\}\)[$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+ end=+)+ contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+    syn match  groovyFuncDef "^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*)" contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+    syn region groovyFuncDef start=+^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+ end=+)+ contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+  else
+    " This line catches method declarations at any indentation>0, but it assumes
+    " two things:
+    "   1. class names are always capitalized (ie: Button)
+    "   2. method names are never capitalized (except constructors, of course)
+    syn region groovyFuncDef start=+^\s\+\(\(public\|protected\|private\|static\|abstract\|final\|native\|synchronized\)\s\+\)*\(\(void\|boolean\|char\|byte\|short\|int\|long\|float\|double\|\([A-Za-z_][A-Za-z0-9_$]*\.\)*[A-Z][A-Za-z0-9_$]*\)\(<[^>]*>\)\=\(\[\]\)*\s\+[a-z][A-Za-z0-9_$]*\|[A-Z][A-Za-z0-9_$]*\)\s*([^0-9]+ end=+)+ contains=groovyScopeDecl,groovyType,groovyStorageClass,groovyComment,groovyLineComment,@groovyClasses
+  endif
+  syn match  groovyBraces  "[{}]"
+  syn cluster groovyTop add=groovyFuncDef,groovyBraces
+endif
+
+if exists("groovy_highlight_debug")
+
+  " Strings and constants
+  syn match   groovyDebugSpecial          contained "\\\d\d\d\|\\."
+  syn region  groovyDebugString           contained start=+"+  end=+"+  contains=groovyDebugSpecial
+  syn match   groovyDebugStringError      +"\([^"\\]\|\\.\)*$+
+  syn match   groovyDebugCharacter        contained "'[^\\]'"
+  syn match   groovyDebugSpecialCharacter contained "'\\.'"
+  syn match   groovyDebugSpecialCharacter contained "'\\''"
+  syn match   groovyDebugNumber           contained "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
+  syn match   groovyDebugNumber           contained "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
+  syn match   groovyDebugNumber           contained "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
+  syn match   groovyDebugNumber           contained "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
+  syn keyword groovyDebugBoolean          contained true false
+  syn keyword groovyDebugType             contained null this super
+  syn region groovyDebugParen  start=+(+ end=+)+ contained contains=groovyDebug.*,groovyDebugParen
+
+  " to make this work you must define the highlighting for these groups
+  syn match groovyDebug "\<System\.\(out\|err\)\.print\(ln\)*\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
+  syn match groovyDebug "\<p\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
+  syn match groovyDebug "[A-Za-z][a-zA-Z0-9_]*\.printStackTrace\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
+  syn match groovyDebug "\<trace[SL]\=\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
+
+  syn cluster groovyTop add=groovyDebug
+
+  if version >= 508 || !exists("did_c_syn_inits")
+    GroovyHiLink groovyDebug                 Debug
+    GroovyHiLink groovyDebugString           DebugString
+    GroovyHiLink groovyDebugStringError      groovyError
+    GroovyHiLink groovyDebugType             DebugType
+    GroovyHiLink groovyDebugBoolean          DebugBoolean
+    GroovyHiLink groovyDebugNumber           Debug
+    GroovyHiLink groovyDebugSpecial          DebugSpecial
+    GroovyHiLink groovyDebugSpecialCharacter DebugSpecial
+    GroovyHiLink groovyDebugCharacter        DebugString
+    GroovyHiLink groovyDebugParen            Debug
+  
+    GroovyHiLink DebugString               String
+    GroovyHiLink DebugSpecial              Special
+    GroovyHiLink DebugBoolean              Boolean
+    GroovyHiLink DebugType                 Type
+  endif
+endif
+
+" Match all Exception classes 
+syn match groovyExceptions        "\<Exception\>\|\<[A-Z]\{1,}[a-zA-Z0-9]*Exception\>"
+
+
+if !exists("groovy_minlines")
+  let groovy_minlines = 10
+endif
+exec "syn sync ccomment groovyComment minlines=" . groovy_minlines
+
+
+" ################### 
+" Groovy stuff
+" syn match groovyOperator		"|[ ,a-zA-Z0-9_*]\+|"
+
+" All groovy valid tokens
+" syn match groovyTokens ";\|,\|<=>\|<>\|:\|:=\|>\|>=\|=\|==\|<\|<=\|!=\|/\|/=\|\.\.|\.\.\.\|\~=\|\~=="
+" syn match groovyTokens "\*=\|&\|&=\|\*\|->\|\~\|+\|-\|/\|?\|<<<\|>>>\|<<\|>>"
+
+" Must put explicit these ones because groovy.vim mark them as errors otherwise
+" syn match groovyTokens "<=>\|<>\|==\~"
+"syn cluster groovyTop add=groovyTokens
+
+" Mark these as operators
+
+" Hightlight brackets
+" syn match  groovyBraces		"[{}]"
+" syn match  groovyBraces		"[\[\]]"
+" syn match  groovyBraces		"[\|]"
+
+if exists("groovy_mark_braces_in_parens_as_errors")
+  syn match groovyInParen          contained "[{}]"
+  GroovyHiLink groovyInParen        groovyError
+  syn cluster groovyTop add=groovyInParen
+endif
+
+" catch errors caused by wrong parenthesis
+syn region  groovyParenT  transparent matchgroup=groovyParen  start="("  end=")" contains=@groovyTop,groovyParenT1
+syn region  groovyParenT1 transparent matchgroup=groovyParen1 start="(" end=")" contains=@groovyTop,groovyParenT2 contained
+syn region  groovyParenT2 transparent matchgroup=groovyParen2 start="(" end=")" contains=@groovyTop,groovyParenT  contained
+syn match   groovyParenError       ")"
+GroovyHiLink groovyParenError       groovyError
+
+" catch errors caused by wrong square parenthesis
+syn region  groovyParenT  transparent matchgroup=groovyParen  start="\["  end="\]" contains=@groovyTop,groovyParenT1
+syn region  groovyParenT1 transparent matchgroup=groovyParen1 start="\[" end="\]" contains=@groovyTop,groovyParenT2 contained
+syn region  groovyParenT2 transparent matchgroup=groovyParen2 start="\[" end="\]" contains=@groovyTop,groovyParenT  contained
+syn match   groovyParenError       "\]"
+
+" ###############################
+" java.vim default highlighting
+if version >= 508 || !exists("did_groovy_syn_inits")
+  if version < 508
+    let did_groovy_syn_inits = 1
+  endif
+  GroovyHiLink groovyFuncDef		Function
+  GroovyHiLink groovyBraces		Function
+  GroovyHiLink groovyBranch		Conditional
+  GroovyHiLink groovyUserLabelRef	groovyUserLabel
+  GroovyHiLink groovyLabel		Label
+  GroovyHiLink groovyUserLabel		Label
+  GroovyHiLink groovyConditional	Conditional
+  GroovyHiLink groovyRepeat		Repeat
+  GroovyHiLink groovyExceptions		Exception
+  GroovyHiLink groovyAssert 		Statement
+  GroovyHiLink groovyStorageClass	StorageClass
+  GroovyHiLink groovyMethodDecl		groovyStorageClass
+  GroovyHiLink groovyClassDecl		groovyStorageClass
+  GroovyHiLink groovyScopeDecl		groovyStorageClass
+  GroovyHiLink groovyBoolean		Boolean
+  GroovyHiLink groovySpecial		Special
+  GroovyHiLink groovySpecialError	Error
+  GroovyHiLink groovySpecialCharError	Error
+  GroovyHiLink groovyString		String
+  GroovyHiLink groovyCharacter		Character
+  GroovyHiLink groovySpecialChar	SpecialChar
+  GroovyHiLink groovyNumber		Number
+  GroovyHiLink groovyError		Error
+  GroovyHiLink groovyStringError	Error
+  GroovyHiLink groovyStatement		Statement
+  GroovyHiLink groovyOperator		Operator
+  GroovyHiLink groovyComment		Comment
+  GroovyHiLink groovyDocComment		Comment
+  GroovyHiLink groovyLineComment	Comment
+  GroovyHiLink groovyConstant		Constant
+  GroovyHiLink groovyTypedef		Typedef
+  GroovyHiLink groovyTodo		Todo
+  
+  GroovyHiLink groovyCommentTitle	SpecialComment
+  GroovyHiLink groovyDocTags		Special
+  GroovyHiLink groovyDocParam		Function
+  GroovyHiLink groovyCommentStar	groovyComment
+  
+  GroovyHiLink groovyType		Type
+  GroovyHiLink groovyExternal		Include
+  
+  GroovyHiLink htmlComment		Special
+  GroovyHiLink htmlCommentPart		Special
+  GroovyHiLink groovySpaceError		Error
+  GroovyHiLink groovyJDKBuiltin         Special
+  GroovyHiLink groovyJDKOperOverl       Operator
+  GroovyHiLink groovyJDKMethods         Function
+endif
+
+delcommand GroovyHiLink
+
+
+let b:current_syntax = "groovy"
+if main_syntax == 'groovy'
+  unlet main_syntax
+endif
+
+let b:spell_options="contained"
+
+" vim: ts=8