updated for version 7.2c-000v7.2c.000

18 files changed, 436 insertions, 370 deletions

diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim
index bd4016615e..ee66bf644d 100644
--- a/runtime/syntax/2html.vim
+++ b/runtime/syntax/2html.vim
@@ -1,6 +1,6 @@
 " Vim syntax support file
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2007 Aug 31
+" Last Change: 2008 Jul 17
 "	       (modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>)
 "	       (XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>)
 "	       (made w3 compliant by Edd Barrett <vext01@gmail.com>)
@@ -238,7 +238,7 @@ let s:LeadingSpace = ' '
 let s:HtmlEndline = ''
 if exists("html_no_pre")
   let s:HtmlEndline = '<br' . s:tag_close
-    let s:LeadingSpace = '&nbsp;'
+  let s:LeadingSpace = '&nbsp;'
   let s:HtmlSpace = '\' . s:LeadingSpace
 endif
 
diff --git a/runtime/syntax/autohotkey.vim b/runtime/syntax/autohotkey.vim
index bbefd6f7b0..42d4cfdfe4 100644
--- a/runtime/syntax/autohotkey.vim
+++ b/runtime/syntax/autohotkey.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:         AutoHotkey script file
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2007-06-01
+" Latest Revision:  2008-06-22
 
 if exists("b:current_syntax")
   finish
@@ -246,6 +246,15 @@ syn keyword autohotkeyBoolean
       \ true
       \ false
 
+" TODO: Shouldn't we look for g:, b:,  variables before defaulting to
+" something?
+if exists("g:autohotkey_syntax_sync_minlines")
+  let b:autohotkey_syntax_sync_minlines = g:autohotkey_syntax_sync_minlines
+else
+  let b:autohotkey_syntax_sync_minlines = 50
+endif
+exec "syn sync ccomment autohotkeyComment minlines=" . b:autohotkey_syntax_sync_minlines
+
 hi def link autohotkeyTodo                Todo
 hi def link autohotkeyComment             Comment
 hi def link autohotkeyCommentStart        autohotkeyComment
diff --git a/runtime/syntax/bzr.vim b/runtime/syntax/bzr.vim
index afbae1a7d2..2968f79b1a 100644
--- a/runtime/syntax/bzr.vim
+++ b/runtime/syntax/bzr.vim
@@ -4,7 +4,7 @@
 " URL:          http://www.hlabs.spb.ru/vim/bzr.vim
 " Revision:     $Id$
 " Filenames:    bzr_log.*
-" Version:      1.0
+" Version:      1.1
 
 " For version 5.x: Clear all syntax items.
 " For version 6.x: Quit when a syntax file was already loaded.
@@ -14,7 +14,7 @@ elseif exists("b:current_syntax")
   finish
 endif
 
-syn region bzrRegion   start="^-\{14} This line and the following will be ignored -\{14}$" end="\%$" contains=ALL
+syn region bzrRegion   start="^-\{14} This line and the following will be ignored -\{14}$" end="\%$" contains=ALL contains=@NoSpell
 syn match bzrRemoved   "^removed:$" contained
 syn match bzrAdded     "^added:$" contained
 syn match bzrRenamed   "^renamed:$" contained
diff --git a/runtime/syntax/doxygen.vim b/runtime/syntax/doxygen.vim
index 4916b4d364..fb4d3cca46 100644
--- a/runtime/syntax/doxygen.vim
+++ b/runtime/syntax/doxygen.vim
@@ -1,11 +1,11 @@
 " DoxyGen syntax hilighting extension for c/c++/idl/java
-" Language:     doxygen on top of c, cpp, idl, java
+" Language:     doxygen on top of c, cpp, idl, java, php
 " Maintainer:   Michael Geddes <vimmer@frog.wheelycreek.net>
 " Author:       Michael Geddes
-" Last Change:  April 2007
-" Version:      1.20
+" Last Change:  July 2008
+" Version:      1.22
 "
-" Copyright 2004-2006 Michael Geddes
+" Copyright 2004-2008 Michael Geddes
 " Please feel free to use, modify & distribute all or part of this script,
 " providing this copyright message remains.
 " I would appreciate being acknowledged in any derived scripts, and would
@@ -30,12 +30,14 @@
 " also be set to any highlight attribute. Alternatively, a highlight for doxygenCodeWord
 " can be used to override it.
 "
-" By default, highlighting is done assumng you have the JAVADOC_AUTOBRIEF
+" By default, highlighting is done assuming you have the JAVADOC_AUTOBRIEF
 " setting turned on in your Doxygen configuration.  If you don't, you
 " can set the variable g:doxygen_javadoc_autobrief to 0 to have the
 " highlighting more accurately reflect the way Doxygen will interpret your
 " comments.
 "
+" Support for cpp, c, idl, doxygen and php.
+"
 " Special thanks to:  Wu Yongwei, Toby Allsopp
 "
 
@@ -56,10 +58,10 @@ try
   "
 
   " C/C++ Style line comments
-  syn region doxygenComment start=+/\*\(\*/\)\@![*!]+  end=+\*/+ contains=doxygenSyncStart,doxygenStart,doxygenTODO keepend fold
-  syn region doxygenCommentL start=+//[/!]<\@!+me=e-1 end=+$+ contains=doxygenStartL keepend skipwhite skipnl nextgroup=doxygenComment2 fold
-  syn region doxygenCommentL start=+//[/!]<+me=e-2 end=+$+ contains=doxygenStartL keepend skipwhite skipnl fold
-  syn region doxygenCommentL start=+//@\ze[{}]+ end=+$+ contains=doxygenGroupDefine,doxygenGroupDefineSpecial fold
+  syn region doxygenComment start=+/\*\(\*/\)\@![*!]+  end=+\*/+ contains=doxygenSyncStart,doxygenStart,doxygenTODO keepend fold containedin=phpRegion
+  syn region doxygenCommentL start=+//[/!]<\@!+me=e-1 end=+$+ contains=doxygenStartL,@Spell keepend skipwhite skipnl nextgroup=doxygenComment2 fold containedin=phpRegion
+  syn region doxygenCommentL start=+//[/!]<+me=e-2 end=+$+ contains=doxygenStartL,@Spell keepend skipwhite skipnl fold containedin=phpRegion
+  syn region doxygenCommentL start=+//@\ze[{}]+ end=+$+ contains=doxygenGroupDefine,doxygenGroupDefineSpecial,@Spell fold containedin=phpRegion
 
   " Single line brief followed by multiline comment.
   syn region doxygenComment2 start=+/\*\(\*/\)\@![*!]+ end=+\*/+ contained contains=doxygenSyncStart2,doxygenStart2,doxygenTODO keepend fold
@@ -98,7 +100,7 @@ try
   " This helps with sync-ing as for some reason, syncing behaves differently to a normal region, and the start pattern does not get matched.
   syn match doxygenSyncStart +\ze[^*/]+ contained nextgroup=doxygenBrief,doxygenPrev,doxygenStartSpecial,doxygenFindBriefSpecial,doxygenStartSkip,doxygenPage skipwhite skipnl
 
-  syn region doxygenBriefLine contained start=+\<\k+ end=+\(\n\s*\*\=\s*\([@\\]\([npcbea]\>\|em\>\|ref\>\|link\>\|f\$\|[$\\&<>#]\)\@!\)\|\s*$\)\@=+ contains=doxygenContinueComment,doxygenFindBriefSpecial,doxygenSmallSpecial,@doxygenHtmlGroup,doxygenTODO,doxygenHyperLink,doxygenHashLink  skipwhite keepend
+  syn region doxygenBriefLine contained start=+\<\k+ end=+\(\n\s*\*\=\s*\([@\\]\([npcbea]\>\|em\>\|ref\>\|link\>\|f\$\|[$\\&<>#]\)\@!\)\|\s*$\)\@=+ contains=doxygenContinueComment,doxygenFindBriefSpecial,doxygenSmallSpecial,@doxygenHtmlGroup,doxygenTODO,doxygenHyperLink,doxygenHashLink,@Spell  skipwhite keepend
 
   " Match a '<' for applying a comment to the previous element.
   syn match doxygenPrev +<+ contained nextgroup=doxygenBrief,doxygenBody,doxygenSpecial,doxygenStartSkip skipwhite
diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim
index a61f7db3ff..8713a721a8 100644
--- a/runtime/syntax/forth.vim
+++ b/runtime/syntax/forth.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:    FORTH
 " Maintainer:  Christian V. J. Brüssow <cvjb@cvjb.de>
-" Last Change: Sa 14 Jul 2007 21:39:53 CEST
+" Last Change: Sa 09 Feb 2008 13:27:29 CET
 " Filenames:   *.fs,*.ft
 " URL:	       http://www.cvjb.de/comp/vim/forth.vim
 
@@ -10,9 +10,17 @@
 " The list of keywords is incomplete, compared with the offical ANS
 " wordlist. If you use this language, please improve it, and send me
 " the patches.
+"
+" Before sending me patches, please download the newest version of this file
+" from http://www.cvjb.de/comp/vim/forth.vim or http://www.vim.org/ (search
+" for forth.vim).
 
 " Many Thanks to...
 "
+" 2008-02-09:
+" Shawn K. Quinn <sjquinn at speakeasy dot net> send a big patch with
+" new words commonly used in Forth programs or defined by GNU Forth.
+"
 " 2007-07-11:
 " Benjamin Krill <ben at codiert dot org> send me a patch
 " to highlight space errors.
@@ -79,7 +87,7 @@ syn keyword forthTodo contained TODO FIXME XXX
 syn match forthTodo contained 'Copyright\(\s([Cc])\)\=\(\s[0-9]\{2,4}\)\='
 
 " Characters allowed in keywords
-" I don't know if 128-255 are allowed in ANS-FORHT
+" I don't know if 128-255 are allowed in ANS-FORTH
 if version >= 600
     setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255
 else
@@ -100,21 +108,27 @@ endif
 
 " basic mathematical and logical operators
 syn keyword forthOperators + - * / MOD /MOD NEGATE ABS MIN MAX
-syn keyword forthOperators AND OR XOR NOT INVERT 2* 2/ 1+ 1- 2+ 2- 8*
+syn keyword forthOperators AND OR XOR NOT LSHIFT RSHIFT INVERT 2* 2/ 1+
+syn keyword forthOperators 1- 2+ 2- 8* UNDER+
 syn keyword forthOperators M+ */ */MOD M* UM* M*/ UM/MOD FM/MOD SM/REM
-syn keyword forthOperators D+ D- DNEGATE DABS DMIN DMAX
+syn keyword forthOperators D+ D- DNEGATE DABS DMIN DMAX D2* D2/
 syn keyword forthOperators F+ F- F* F/ FNEGATE FABS FMAX FMIN FLOOR FROUND
 syn keyword forthOperators F** FSQRT FEXP FEXPM1 FLN FLNP1 FLOG FALOG FSIN
 syn keyword forthOperators FCOS FSINCOS FTAN FASIN FACOS FATAN FATAN2 FSINH
-syn keyword forthOperators FCOSH FTANH FASINH FACOSH FATANH
-syn keyword forthOperators 0< 0<= 0<> 0= 0> 0>= < <= <> = > >=
-syn keyword forthOperators ?NEGATE ?DNEGATE
+syn keyword forthOperators FCOSH FTANH FASINH FACOSH FATANH F2* F2/ 1/F
+syn keyword forthOperators F~REL F~ABS F~
+syn keyword forthOperators 0< 0<= 0<> 0= 0> 0>= < <= <> = > >= U< U<=
+syn keyword forthOperators U> U>= D0< D0<= D0<> D0= D0> D0>= D< D<= D<>
+syn keyword forthOperators D= D> D>= DU< DU<= DU> DU>= WITHIN ?NEGATE
+syn keyword forthOperators ?DNEGATE 
 
 " stack manipulations
 syn keyword forthStack DROP NIP DUP OVER TUCK SWAP ROT -ROT ?DUP PICK ROLL
-syn keyword forthStack 2DROP 2NIP 2DUP 2OVER 2TUCK 2SWAP 2ROT
-syn keyword forthStack 3DUP 4DUP
+syn keyword forthStack 2DROP 2NIP 2DUP 2OVER 2TUCK 2SWAP 2ROT 2-ROT
+syn keyword forthStack 3DUP 4DUP 5DUP 3DROP 4DROP 5DROP 8DROP 4SWAP 4ROT
+syn keyword forthStack 4-ROT 4TUCK 8SWAP 8DUP
 syn keyword forthRStack >R R> R@ RDROP 2>R 2R> 2R@ 2RDROP
+syn keyword forthRstack 4>R 4R> 4R@ 4RDROP
 syn keyword forthFStack FDROP FNIP FDUP FOVER FTUCK FSWAP FROT
 
 " stack pointer manipulations
@@ -139,24 +153,40 @@ syn keyword forthLoop ?DO LOOP I J K +DO U+DO -DO U-DO DO +LOOP -LOOP
 syn keyword forthLoop UNLOOP LEAVE ?LEAVE EXIT DONE FOR NEXT
 
 " new words
+syn match forthClassDef '\<:class\s*[^ \t]\+\>'
+syn match forthObjectDef '\<:object\s*[^ \t]\+\>'
 syn match forthColonDef '\<:m\?\s*[^ \t]\+\>'
 syn keyword forthEndOfColonDef ; ;M ;m
-syn keyword forthDefine CONSTANT 2CONSTANT FCONSTANT VARIABLE 2VARIABLE CREATE
-syn keyword forthDefine USER VALUE TO DEFER IS DOES> IMMEDIATE COMPILE-ONLY
-syn keyword forthDefine COMPILE RESTRICT INTERPRET POSTPONE EXECUTE LITERAL
-syn keyword forthDefine CREATE-INTERPRET/COMPILE INTERPRETATION> <INTERPRETATION
-syn keyword forthDefine COMPILATION> <COMPILATION ] LASTXT COMP' POSTPONE,
-syn keyword forthDefine FIND-NAME NAME>INT NAME?INT NAME>COMP NAME>STRING STATE
-syn keyword forthDefine C; CVARIABLE
+syn keyword forthEndOfClassDef ;class
+syn keyword forthEndOfObjectDef ;object
+syn keyword forthDefine CONSTANT 2CONSTANT FCONSTANT VARIABLE 2VARIABLE
+syn keyword forthDefine FVARIABLE CREATE USER VALUE TO DEFER IS DOES> IMMEDIATE
+syn keyword forthDefine COMPILE-ONLY COMPILE RESTRICT INTERPRET POSTPONE EXECUTE
+syn keyword forthDefine LITERAL CREATE-INTERPRET/COMPILE INTERPRETATION>
+syn keyword forthDefine <INTERPRETATION COMPILATION> <COMPILATION ] LASTXT
+syn keyword forthDefine COMP' POSTPONE, FIND-NAME NAME>INT NAME?INT NAME>COMP
+syn keyword forthDefine NAME>STRING STATE C; CVARIABLE
+syn keyword forthDefine , 2, F, C, 
+syn match forthDefine "\[IFDEF]"
+syn match forthDefine "\[IFUNDEF]"
+syn match forthDefine "\[THEN]"
+syn match forthDefine "\[ENDIF]"
+syn match forthDefine "\[ELSE]"
+syn match forthDefine "\[?DO]"
+syn match forthDefine "\[DO]"
+syn match forthDefine "\[LOOP]"
+syn match forthDefine "\[+LOOP]"
+syn match forthDefine "\[NEXT]"
+syn match forthDefine "\[BEGIN]"
+syn match forthDefine "\[UNTIL]"
+syn match forthDefine "\[AGAIN]"
+syn match forthDefine "\[WHILE]"
+syn match forthDefine "\[REPEAT]"
 syn match forthDefine "\[COMP']"
 syn match forthDefine "'"
 syn match forthDefine '\<\[\>'
 syn match forthDefine "\[']"
 syn match forthDefine '\[COMPILE]'
-syn match forthClassDef '\<:class\s*[^ \t]\+\>'
-syn match forthObjectDef '\<:object\s*[^ \t]\+\>'
-syn keyword forthEndOfClassDef ';class'
-syn keyword forthEndOfObjectDef ';object'
 
 " debugging
 syn keyword forthDebug PRINTDEBUGDATA PRINTDEBUGLINE
@@ -175,27 +205,48 @@ syn match forthCharOps '\<\[char\]\s\S\s'
 syn region forthCharOps start=+."\s+ skip=+\\"+ end=+"+
 
 " char-number conversion
-syn keyword forthConversion <# # #> #S (NUMBER) (NUMBER?) CONVERT D>F D>S DIGIT
-syn keyword forthConversion DPL F>D HLD HOLD NUMBER S>D SIGN >NUMBER
+syn keyword forthConversion <<# <# # #> #>> #S (NUMBER) (NUMBER?) CONVERT D>F 
+syn keyword forthConversion D>S DIGIT DPL F>D HLD HOLD NUMBER S>D SIGN >NUMBER
+syn keyword forthConversion F>S S>F
 
 " interptreter, wordbook, compiler
 syn keyword forthForth (LOCAL) BYE COLD ABORT >BODY >NEXT >LINK CFA >VIEW HERE
 syn keyword forthForth PAD WORDS VIEW VIEW> N>LINK NAME> LINK> L>NAME FORGET
-syn keyword forthForth BODY>
+syn keyword forthForth BODY> ASSERT( ASSERT0( ASSERT1( ASSERT2( ASSERT3( )
 syn region forthForth start=+ABORT"\s+ skip=+\\"+ end=+"+
 
 " vocabularies
 syn keyword forthVocs ONLY FORTH ALSO ROOT SEAL VOCS ORDER CONTEXT #VOCS
 syn keyword forthVocs VOCABULARY DEFINITIONS
 
+" File keywords
+syn keyword forthFileMode R/O R/W W/O BIN 
+syn keyword forthFileWords OPEN-FILE CREATE-FILE CLOSE-FILE DELETE-FILE
+syn keyword forthFileWords RENAME-FILE READ-FILE READ-LINE KEY-FILE
+syn keyword forthFileWords KEY?-FILE WRITE-FILE WRITE-LINE EMIT-FILE
+syn keyword forthFileWords FLUSH-FILE FILE-STATUS FILE-POSITION
+syn keyword forthFileWords REPOSITION-FILE FILE-SIZE RESIZE-FILE
+syn keyword forthFileWords SLURP-FILE SLURP-FID STDIN STDOUT STDERR
+syn keyword forthBlocks OPEN-BLOCKS USE LOAD --> BLOCK-OFFSET
+syn keyword forthBlocks GET-BLOCK-FID BLOCK-POSITION LIST SCR BLOCK
+syn keyword forthBlocks BUFER EMPTY-BUFFERS EMPTY-BUFFER UPDATE UPDATED?
+syn keyword forthBlocks SAVE-BUFFERS SAVE-BUFFER FLUSH THRU +LOAD +THRU
+syn keyword forthBlocks BLOCK-INCLUDED
+
 " numbers
 syn keyword forthMath DECIMAL HEX BASE
 syn match forthInteger '\<-\=[0-9.]*[0-9.]\+\>'
+syn match forthInteger '\<&-\=[0-9.]*[0-9.]\+\>'
 " recognize hex and binary numbers, the '$' and '%' notation is for gforth
 syn match forthInteger '\<\$\x*\x\+\>' " *1* --- dont't mess
 syn match forthInteger '\<\x*\d\x*\>'  " *2* --- this order!
 syn match forthInteger '\<%[0-1]*[0-1]\+\>'
-syn match forthFloat '\<-\=\d*[.]\=\d\+[Ee]\d\+\>'
+syn match forthFloat '\<-\=\d*[.]\=\d\+[DdEe]\d\+\>'
+syn match forthFloat '\<-\=\d*[.]\=\d\+[DdEe][-+]\d\+\>'
+
+" XXX If you find this overkill you can remove it. this has to come after the
+" highlighting for numbers otherwise it has no effect.
+syn region forthComment start='0 \[if\]' end='\[endif\]' end='\[then\]' contains=forthTodo
 
 " Strings
 syn region forthString start=+\.*\"+ end=+"+ end=+$+
@@ -212,9 +263,15 @@ syn region forthComment start='/\*' end='\*/' contains=forthTodo,forthSpaceError
 
 " Include files
 syn match forthInclude '^INCLUDE\s\+\k\+'
+syn match forthInclude '^require\s\+\k\+'
 syn match forthInclude '^fload\s\+'
 syn match forthInclude '^needs\s\+'
 
+" Locals definitions
+syn region forthLocals start='{\s' start='{$' end='\s}' end='^}'
+syn match forthLocals '{ }' " otherwise, at least two spaces between
+syn region forthDeprecated start='locals|' end='|'
+
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
 " For version 5.8 and later: only when an item doesn't have highlighting yet
@@ -257,6 +314,11 @@ if version >= 508 || !exists("did_forth_syn_inits")
     HiLink forthObjectDef Define
     HiLink forthEndOfObjectDef Define
     HiLink forthInclude Include
+    HiLink forthLocals Type " nothing else uses type and locals must stand out
+    HiLink forthDeprecated Error " if you must, change to Type
+    HiLink forthFileMode Function
+    HiLink forthFileWords Statement
+    HiLink forthBlocks Statement
     HiLink forthSpaceError Error
 
     delcommand HiLink
diff --git a/runtime/syntax/mailaliases.vim b/runtime/syntax/mailaliases.vim
index de85a174fa..743068f66f 100644
--- a/runtime/syntax/mailaliases.vim
+++ b/runtime/syntax/mailaliases.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:         aliases(5) local alias database file
 " Maintainer:       Nikolai Weibull <nikolai@bitwi.se>
-" Latest Revision:  2006-01-14
+" Latest Revision:  2008-04-14
 
 if exists("b:current_syntax")
   finish
@@ -19,7 +19,7 @@ syn match   mailaliasesBegin        display '^'
                                     \ nextgroup=mailaliasesName,
                                     \ mailaliasesComment
 
-syn match   mailaliasesName         contained '[0-9A-Za-z_-]\+'
+syn match   mailaliasesName         contained '[[:alnum:]\._-]\+'
                                     \ nextgroup=mailaliasesColon
 
 syn region  mailaliasesName         contained oneline start=+"+
diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim
index 5e72f4e69e..e9d7ee99d6 100644
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
@@ -2,7 +2,7 @@
 " Language:	Makefile
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
 " URL:		http://www.fleiner.com/vim/syntax/make.vim
-" Last Change:	2007 Apr 30
+" Last Change:	2008 Aug 04
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -63,7 +63,7 @@ syn match makeCmdNextLine	"\\\n."he=e-1 contained
 
 
 " Statements / Functions (GNU make)
-syn match makeStatement contained "(\(subst\|addprefix\|addsuffix\|basename\|call\|dir\|error\|eval\|filter-out\|filter\|findstring\|firstword\|foreach\|if\|join\|notdir\|origin\|patsubst\|shell\|sort\|strip\|suffix\|warning\|wildcard\|word\|wordlist\|words\)\>"ms=s+1
+syn match makeStatement contained "(\(subst\|abspath\|addprefix\|addsuffix\|and\|basename\|call\|dir\|error\|eval\|filter-out\|filter\|findstring\|firstword\|flavor\|foreach\|if\|info\|join\|lastword\|notdir\|or\|origin\|patsubst\|realpath\|shell\|sort\|strip\|suffix\|value\|warning\|wildcard\|word\|wordlist\|words\)\>"ms=s+1
 
 " Comment
 if exists("make_microsoft")
diff --git a/runtime/syntax/modconf.vim b/runtime/syntax/modconf.vim
index d4e8827bec..54b6593b66 100644
--- a/runtime/syntax/modconf.vim
+++ b/runtime/syntax/modconf.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:         modules.conf(5) configuration file
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2007-06-17
+" Latest Revision:  2007-10-25
 
 if exists("b:current_syntax")
   finish
@@ -21,7 +21,7 @@ syn keyword modconfConditional  if else elseif endif
 
 syn keyword modconfPreProc      alias define include keep prune
                                 \ post-install post-remove pre-install
-                                \ pre-remove persistdir
+                                \ pre-remove persistdir blacklist
 
 syn keyword modconfKeyword      add above below install options probe probeall
                                 \ remove
diff --git a/runtime/syntax/natural.vim b/runtime/syntax/natural.vim
index f7f140f588..2628151378 100644
--- a/runtime/syntax/natural.vim
+++ b/runtime/syntax/natural.vim
@@ -1,205 +1,209 @@
 " Vim syntax file
 "
-" Language:		NATURAL
-" Version:		2.0.26.17
-" Maintainer:	Marko Leipert <vim@mleipert.de>
-" Last Changed:	2002-02-28 09:50:36
-" Support:		http://www.winconsole.de/vim/syntax.html
+" Language:	NATURAL
+" Version:	2.1.0.3
+" Maintainer:	Marko von Oppen <marko@von-oppen.com>
+" Last Changed:	2008-07-29 01:40:52
+" Support:	http://www.von-oppen.com/
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when this syntax file was already loaded
 if v:version < 600
-	syntax clear
-	set iskeyword+=-,*,#,+,_,/
+  syntax clear
+  set iskeyword+=-,*,#,+,_,/
 elseif exists("b:current_syntax")
-	finish
+  finish
 else
-	setlocal iskeyword+=-,*,#,+,_,/
+  setlocal iskeyword+=-,*,#,+,_,/
 endif
 
 " NATURAL is case insensitive
 syntax case ignore
 
 " preprocessor
-syn keyword naturalInclude		include nextgroup=naturalObjName skipwhite
+syn keyword naturalInclude	include nextgroup=naturalObjName skipwhite
 
 " define data
-syn keyword naturalKeyword		define data end-define
-syn keyword naturalKeyword		independent global parameter local redefine view
-syn keyword naturalKeyword		const[ant] init initial
+syn keyword naturalKeyword	define data end-define
+syn keyword naturalKeyword	independent global parameter local redefine view
+syn keyword naturalKeyword	const[ant] init initial
 
 " loops
-syn keyword naturalLoop			read end-read end-work find end-find histogram end-histogram
-syn keyword naturalLoop			end-all sort end-sort sorted descending ascending
-syn keyword naturalRepeat		repeat end-repeat while until for step end-for
-syn keyword naturalKeyword		in file with field starting from ending at thru by isn where
-syn keyword naturalError		on error end-error
-syn keyword naturalKeyword		accept reject end-enddata number unique retain as release
-syn keyword naturalKeyword		start end-start break end-break physical page top sequence
-syn keyword naturalKeyword		end-toppage end-endpage end-endfile before processing
-syn keyword naturalKeyword		end-before
+syn keyword naturalLoop		read end-read end-work find end-find histogram end-histogram
+syn keyword naturalLoop		end-all sort end-sort sorted descending ascending
+syn keyword naturalRepeat	repeat end-repeat while until for step end-for
+syn keyword naturalKeyword	in file with field starting from ending at thru by isn where
+syn keyword naturalError	on error end-error
+syn keyword naturalKeyword	accept reject end-enddata number unique retain as release
+syn keyword naturalKeyword	start end-start break end-break physical page top sequence
+syn keyword naturalKeyword	end-toppage end-endpage end-endfile before processing
+syn keyword naturalKeyword	end-before
 
 " conditionals
 syn keyword naturalConditional	if then else end-if end-norec
 syn keyword naturalConditional	decide end-decide value when condition none any
 
 " assignment / calculation
-syn keyword naturalKeyword		reset assign move left right justified compress to into edited
-syn keyword naturalKeyword		add subtract multiply divide compute name
-syn keyword naturalKeyword		all giving remainder rounded leaving space
-syn keyword naturalKeyword		examine full replace giving separate delimiter modified
-syn keyword naturalKeyword		suspend identical suppress
+syn keyword naturalKeyword	reset assign move left right justified compress to into edited
+syn keyword naturalKeyword	add subtract multiply divide compute name
+syn keyword naturalKeyword	all giving remainder rounded leaving space numeric
+syn keyword naturalKeyword	examine full replace giving separate delimiter modified
+syn keyword naturalKeyword	suspend identical suppress
 
 " program flow
-syn keyword naturalFlow			callnat fetch return enter escape bottom top stack formatted
-syn keyword naturalFlow			command call
-syn keyword naturalflow			end-subroutine routine
+syn keyword naturalFlow		callnat fetch return enter escape bottom top stack formatted
+syn keyword naturalFlow		command call
+syn keyword naturalflow		end-subroutine routine
 
 " file operations
-syn keyword naturalKeyword		update store get delete end transaction work once close
+syn keyword naturalKeyword	update store get delete end transaction work once close
 
 " other keywords
-syn keyword naturalKeyword		first every of no record[s] found ignore immediate
-syn keyword naturalKeyword		set settime key control stop terminate
+syn keyword naturalKeyword	first every of no record[s] found ignore immediate
+syn keyword naturalKeyword	set settime key control stop terminate
 
 " in-/output
-syn keyword naturalKeyword		write display input reinput notitle nohdr map newpage mark
-syn keyword naturalKeyword		alarm text help eject index
-syn keyword naturalKeyword		format printer skip lines
+syn keyword naturalKeyword	write display input reinput notitle nohdr map newpage
+syn keyword naturalKeyword	alarm text help eject index window base size
+syn keyword naturalKeyword	format printer skip lines
 
 " functions
-syn keyword naturalKeyword		abs atn cos exp frac int log sgn sin sqrt tan val old
+syn keyword naturalKeyword	abs atn cos exp frac int log sgn sin sqrt tan val old
+syn keyword naturalKeyword	pos
 
 " report mode keywords
 syn keyword naturalRMKeyword	same loop obtain indexed do doend
 
 " Subroutine name
-syn keyword	naturalFlow			perform subroutine nextgroup=naturalFunction skipwhite
-syn match	naturalFunction		"\<[a-z][-_a-z0-9]*\>"
+syn keyword naturalFlow		perform subroutine nextgroup=naturalFunction skipwhite
+syn match   naturalFunction	"\<[a-z][-_a-z0-9]*\>"
 
-syn keyword	naturalFlow			using nextgroup=naturalKeyword,naturalObjName skipwhite
-syn match	naturalObjName		"\<[a-z][-_a-z0-9]\{,7}\>"
+syn keyword naturalFlow		using nextgroup=naturalKeyword,naturalObjName skipwhite
+syn match   naturalObjName	"\<[a-z][-_a-z0-9]\{,7}\>"
 
 " Labels
-syn match	naturalLabel		"\<[+#a-z][-_#a-z0-9]*\."
-syn match	naturalRef			"\<[+#a-z][-_#a-z0-9]*\>\.\<[+#a-z][*]\=[-_#a-z0-9]*\>"
+syn match   naturalLabel	"\<[+#a-z][-_#a-z0-9]*\."
+syn match   naturalRef		"\<[+#a-z][-_#a-z0-9]*\>\.\<[+#a-z][*]\=[-_#a-z0-9]*\>"
+
+" mark keyword special handling
+syn keyword naturalKeyword	mark nextgroup=naturalMark skipwhite
+syn match   naturalMark		"\<\*[a-z][-_#.a-z0-9]*\>"
 
 " System variables
-syn match	naturalSysVar		"\<\*[a-z][-a-z0-9]*\>"
+syn match   naturalSysVar	"\<\*[a-z][-a-z0-9]*\>"
 
 "integer number, or floating point number without a dot.
-syn match	naturalNumber		"\<-\=\d\+\>"
+syn match   naturalNumber	"\<-\=\d\+\>"
 "floating point number, with dot
-syn match	naturalNumber		"\<-\=\d\+\.\d\+\>"
+syn match   naturalNumber	"\<-\=\d\+\.\d\+\>"
 "floating point number, starting with a dot
-syn match	naturalNumber		"\.\d\+"
+syn match   naturalNumber	"\.\d\+"
 
 " Formats in write statement
-syn match	naturalFormat		"\<\d\+[TX]\>"
+syn match   naturalFormat	"\<\d\+[TX]\>"
 
 " String and Character contstants
-syn match	naturalString		"H'\x\+'"
-syn region  naturalString		start=+"+ end=+"+
-syn region	naturalString		start=+'+ end=+'+
+syn match   naturalString	"H'\x\+'"
+syn region  naturalString	start=+"+ end=+"+
+syn region  naturalString	start=+'+ end=+'+
 
 " Type definition
-syn match	naturalAttribute	"\<[-a-z][a-z]=[-a-z0-9_\.,]\+\>"
-syn match	naturalType			contained "\<[ABINP]\d\+\(,\d\+\)\=\>"
-syn match	naturalType			contained "\<[CL]\>"
+syn match   naturalAttribute	"\<[-a-z][a-z]=[-a-z0-9_\.,]\+\>"
+syn match   naturalType		contained "\<[ABINP]\d\+\(,\d\+\)\=\>"
+syn match   naturalType		contained "\<[CL]\>"
 
 " "TODO" / other comments
-syn keyword naturalTodo			contained todo test
-syn match	naturalCommentMark	contained "[a-z][^ \t/:|]*\(\s[^ \t/:'"|]\+\)*:\s"he=e-1
+syn keyword naturalTodo		contained todo test
+syn match   naturalCommentMark	contained "[a-z][^ \t/:|]*\(\s[^ \t/:'"|]\+\)*:\s"he=e-1
 
 " comments
-syn region	naturalComment		start="/\*" end="$" contains=naturalTodo,naturalLineRef,naturalCommentMark
-syn region	naturalComment		start="^\*[\ \*]" end="$" contains=naturalTodo,naturalLineRef,naturalCommentMark
-syn region	naturalComment		start="^\d\{4} \*[\ \*]"lc=5 end="$" contains=naturalTodo,naturalLineRef,naturalCommentMark
-syn match	naturalComment		"^*$"
-syn match	naturalComment		"^\d\{4} \*$"lc=5
+syn region  naturalComment	start="/\*" end="$" contains=naturalTodo,naturalLineRef,naturalCommentMark
+syn region  naturalComment	start="^\*[ *]" end="$" contains=naturalTodo,naturalLineRef,naturalCommentMark
+syn region  naturalComment	start="^\d\{4} \*[\ \*]"lc=5 end="$" contains=naturalTodo,naturalLineRef,naturalCommentMark
+syn match   naturalComment	"^\*$"
+syn match   naturalComment	"^\d\{4} \*$"lc=5
 " /* is legal syntax in parentheses e.g. "#ident(label./*)"
-syn region	naturalPComment		contained start="/\*\s*[^),]"  end="$" contains=naturalTodo,naturalLineRef,naturalCommentMark
+syn region  naturalPComment	contained start="/\*\s*[^),]"  end="$" contains=naturalTodo,naturalLineRef,naturalCommentMark
 
 " operators
-syn keyword	naturalOperator		and or not eq ne gt lt ge le mask scan
+syn keyword naturalOperator	and or not eq ne gt lt ge le mask scan modified
 
 " constants
-syn keyword naturalBoolean		true false
-
-syn match	naturalLineNo		"^\d\{4}"
+syn keyword naturalBoolean	true false
+syn match   naturalLineNo	"^\d\{4}"
 
 " identifiers
-syn match	naturalIdent		"\<[+#a-z][-_#a-z0-9]*\>[^\.']"me=e-1
-syn match	naturalIdent		"\<[+#a-z][-_#a-z0-9]*$"
-syn match	naturalLegalIdent	"[+#a-z][-_#a-z0-9]*/[-_#a-z0-9]*"
+syn match   naturalIdent	"\<[+#a-z][-_#a-z0-9]*\>[^\.']"me=e-1
+syn match   naturalIdent	"\<[+#a-z][-_#a-z0-9]*$"
+syn match   naturalLegalIdent	"[+#a-z][-_#a-z0-9]*/[-_#a-z0-9]*"
 
 " parentheses
-syn region  naturalPar			matchgroup=naturalParGui start="(" end=")" contains=naturalLabel,naturalRef,naturalOperator,@naturalConstant,naturalType,naturalSysVar,naturalPar,naturalLineNo,naturalPComment
-syn match	naturalLineRef		"(\d\{4})"
+syn region  naturalPar		matchgroup=naturalParGui start="(" end=")" contains=naturalLabel,naturalRef,naturalOperator,@naturalConstant,naturalType,naturalSysVar,naturalPar,naturalLineNo,naturalPComment
+syn match   naturalLineRef	"(\d\{4})"
 
 " build syntax groups
 syntax cluster naturalConstant	contains=naturalString,naturalNumber,naturalAttribute,naturalBoolean
 
 " folding
 if v:version >= 600
-	set foldignore=*
+  set foldignore=*
 endif
 
 
 if v:version >= 508 || !exists("did_natural_syntax_inits")
-	if v:version < 508
-		let did_natural_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
-	" The default methods for highlighting.  Can be overridden later
-
-	" Constants
-	HiLink naturalFormat		Constant
-	HiLink naturalAttribute		Constant
-	HiLink naturalNumber		Number
-	HiLink naturalString		String
-	HiLink naturalBoolean		Boolean
-
-	" All kinds of keywords
-	HiLink naturalConditional	Conditional
-	HiLink naturalRepeat		Repeat
-	HiLink naturalLoop			Repeat
-	HiLink naturalFlow			Keyword
-	HiLink naturalError			Keyword
-	HiLink naturalKeyword		Keyword
-	HiLink naturalOperator		Operator
-	HiLink naturalParGui		Operator
-
-	" Labels
-	HiLink naturalLabel			Label
-	HiLink naturalRefLabel		Label
-
-	" Comments
-	HiLink naturalPComment		Comment
-	HiLink naturalComment		Comment
-	HiLink naturalTodo			Todo
-	HiLink naturalCommentMark	PreProc
-
-	HiLink naturalInclude		Include
-	HiLink naturalSysVar		Identifier
-	HiLink naturalLineNo		LineNr
-	HiLink naturalLineRef		Error
-	HiLink naturalSpecial		Special
-	HiLink naturalComKey		Todo
-
-	" illegal things
-	HiLink naturalRMKeyword		Error
-	HiLink naturalLegalIdent	Error
-
-	HiLink naturalType			Type
-	HiLink naturalFunction		Function
-	HiLink naturalObjName		Function
-
-	delcommand HiLink
+  if v:version < 508
+    let did_natural_syntax_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  " The default methods for highlighting.  Can be overridden later
+
+  " Constants
+  HiLink naturalFormat		Constant
+  HiLink naturalAttribute	Constant
+  HiLink naturalNumber		Number
+  HiLink naturalString		String
+  HiLink naturalBoolean		Boolean
+
+  " All kinds of keywords
+  HiLink naturalConditional	Conditional
+  HiLink naturalRepeat		Repeat
+  HiLink naturalLoop		Repeat
+  HiLink naturalFlow		Keyword
+  HiLink naturalError		Keyword
+  HiLink naturalKeyword		Keyword
+  HiLink naturalOperator	Operator
+  HiLink naturalParGui		Operator
+
+  " Labels
+  HiLink naturalLabel		Label
+  HiLink naturalRefLabel	Label
+
+  " Comments
+  HiLink naturalPComment	Comment
+  HiLink naturalComment		Comment
+  HiLink naturalTodo		Todo
+  HiLink naturalCommentMark	PreProc
+
+  HiLink naturalInclude		Include
+  HiLink naturalSysVar		Identifier
+  HiLink naturalLineNo		LineNr
+  HiLink naturalLineRef		Error
+  HiLink naturalSpecial		Special
+  HiLink naturalComKey		Todo
+
+  " illegal things
+  HiLink naturalRMKeyword	Error
+  HiLink naturalLegalIdent	Error
+
+  HiLink naturalType		Type
+  HiLink naturalFunction	Function
+  HiLink naturalObjName		PreProc
+
+  delcommand HiLink
 endif
 
 let b:current_syntax = "natural"
 
-" vim:set ts=4 sw=4 noet ft=vim list:
+" vim:set ts=8 sw=8 noet ft=vim:
diff --git a/runtime/syntax/racc.vim b/runtime/syntax/racc.vim
index 795b65243e..d412227cbd 100644
--- a/runtime/syntax/racc.vim
+++ b/runtime/syntax/racc.vim
@@ -1,7