updated for version 7.0020
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 5b3e74f..afb43a4 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2004 Oct 11
+*eval.txt*      For Vim version 7.0aa.  Last change: 2004 Oct 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -2977,6 +2977,7 @@
 multi_lang		Compiled with support for multiple languages.
 mzscheme		Compiled with MzScheme interface |mzscheme|.
 netbeans_intg		Compiled with support for |netbeans|.
+netbeans_enabled	Compiled with support for |netbeans| and it's used.
 ole			Compiled with OLE automation support for Win32.
 os2			OS/2 version of Vim.
 osfiletype		Compiled with support for osfiletypes |+osfiletype|
diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index 00f5474..6644439 100644
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -1,4 +1,4 @@
-*fold.txt*      For Vim version 7.0aa.  Last change: 2004 Jun 14
+*fold.txt*      For Vim version 7.0aa.  Last change: 2004 Oct 15
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -190,11 +190,11 @@
 3. if a marker with a lower fold level is found, all folds up to and including
    this level end and a fold with the specified level starts.
 
-The number indicates the fold level.  A zero cannot be used.
-You can use "}}}" with a digit to indicate the level of the fold that
-ends.  The fold level of the following line will be one less than the
-indicated level.  Note that Vim doesn't look back to the level of the matching
-marker (that would take too much time).  Example: >
+The number indicates the fold level.  A zero cannot be used (a marker with
+level zero is ignored).  You can use "}}}" with a digit to indicate the level
+of the fold that ends.  The fold level of the following line will be one less
+than the indicated level.  Note that Vim doesn't look back to the level of the
+matching marker (that would take too much time).  Example: >
 
 	{{{1
 	fold level here is 1
diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt
index 7754f20..102a115 100644
--- 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: 2004 Jul 23
+*if_cscop.txt*  For Vim version 7.0aa.  Last change: 2004 Oct 21
 
 
 		  VIM REFERENCE MANUAL    by Andy Kahn
@@ -245,8 +245,9 @@
 '-' implies previous results clearance, '0' or command absence - don't use
 quickfix. Search is performed from start until first command occurrence.
 The default value is "" (don't use quickfix anyway). The following value
-seems to be useful: "s-,c-,d-,i-,t-,e-".
-
+seems to be useful: >
+	:set cscopequickfix=s-,c-,d-,i-,t-,e-
+<
 							*cscopetag* *cst*
 If 'cscopetag' set, the commands ":tag" and CTRL-] as well as "vim -t" will
 always use |:cstag| instead of the default :tag behavior.  Effectively, by
diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
index ee6adea..e7a9aa0 100644
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -417,6 +417,12 @@
 initDone	Mark the buffer as ready for use.  Implicitly makes the buffer
 		the current buffer.  Fires the BufReadPost autocommand event.
 
+insertDone
+		Sent by NetBeans to tell vim an initial file insert is done.
+		This triggers a read message being printed. Prior to version
+		2.3, no read messages were displayed after opening a file.
+		New in version 2.3.
+
 moveAnnoToFront serNum
 		Not implemented.
 
@@ -450,6 +456,12 @@
 		- 'buftype' disallows writing
 		New in version 2.2.
 
+saveDone
+		Sent by NetBeans to tell vim a save is done. This triggers
+		a save message being printed. Prior to version 2.3, no save
+		messages were displayed after a save.
+		New in version 2.3.
+
 setAsUser	Not implemented.
 
 setBufferNumber pathname
@@ -473,6 +485,7 @@
 		This delay is used to give the IDE a chance to handle things
 		before really exiting.  The default delay is two seconds.
 		New in version 2.1.
+		Obsolete in version 2.3.
 
 setFullName pathname
 		Set the file name to be used for a buffer to "pathname", a
@@ -490,7 +503,14 @@
 		When the boolean argument "modified" is "T" mark the buffer as
 		modified, when it is "F" mark it as unmodified.
 
-setReadOnly	Not implemented.
+setModtime time
+		Update a buffers modification time after NetBeans saves the
+		file.
+		New in version 2.3.
+
+setReadOnly
+		Passed by NetBeans to tell vim a file is readonly.
+		Implemented in verion 2.3.
 
 setStyle	Not implemented.
 
@@ -508,7 +528,11 @@
 		disappear when the mouse is moved more than a few pixels.
 		New in version 2.1.
 
-specialKeys	Not implemented.
+specialKeys
+		Map a set of keys (mostly function keys) to be passed back
+		to NetBeans for processing. This lets NetBeans hotkeys be
+		used from vim.
+		Implemented in version 2.3.
 
 startAtomic	Begin an atomic operation.  The screen will not be updated
 		until "endAtomic" is given.
@@ -620,6 +644,11 @@
 		in the sign area.
 		New in version 2.2.
 
+disconnect
+		Tell NetBeans that vim is exiting and not to try and read or
+		write more commands.
+		New in version 2.3.
+
 fileClosed	Not implemented.
 
 fileModified	Not implemented.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 6001909..769a45c 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2004 Oct 08
+*options.txt*	For Vim version 7.0aa.  Last change: 2004 Oct 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -918,7 +918,7 @@
 	  impossible!).  Writing may fail because of this.
 	- A directory "." means to put the backup file in the same directory
 	  as the edited file.
-	- A directory starting with "./" (or ".\" for MS-DOS et.al.) means to
+	- A directory starting with "./" (or ".\" for MS-DOS et al.) means to
 	  put the backup file relative to where the edited file is.  The
 	  leading "." is replaced with the path name of the edited file.
 	  ("." inside a directory name has no special meaning).
@@ -2046,7 +2046,7 @@
 	  the edited file.  On Unix, a dot is prepended to the file name, so
 	  it doesn't show in a directory listing.  On MS-Windows the "hidden"
 	  attribute is set and a dot prepended if possible.
-	- A directory starting with "./" (or ".\" for MS-DOS et.al.) means to
+	- A directory starting with "./" (or ".\" for MS-DOS et al.) means to
 	  put the swap file relative to where the edited file is.  The leading
 	  "." is replaced with the path name of the edited file.
 	- For Unix and Win32, if a directory ends in two path separators, the
@@ -2187,10 +2187,11 @@
 			global
 			{not in Vi}
 	When on, all the windows are automatically made the same size after
-	splitting or closing a window.  When off, splitting a window will
-	reduce the size of the current window and leave the other windows the
-	same.  When closing a window the extra lines are given to the window
-	next to it (depending on 'splitbelow' and 'splitright').
+	splitting or closing a window.  This also happens the moment the
+	option is switched on.  When off, splitting a window will reduce the
+	size of the current window and leave the other windows the same.  When
+	closing a window the extra lines are given to the window next to it
+	(depending on 'splitbelow' and 'splitright').
 	When mixing vertically and horizontally split windows, a minimal size
 	is computed and some windows may be larger if there is room.  The
 	'eadirection' option tells in which direction the size is affected.
diff --git a/runtime/doc/tags b/runtime/doc/tags
index b6c30f3..b3ea0e8 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -5223,6 +5223,7 @@
 keymap-hebrew	mbyte.txt	/*keymap-hebrew*
 keypad-0	intro.txt	/*keypad-0*
 keypad-9	intro.txt	/*keypad-9*
+keypad-comma	term.txt	/*keypad-comma*
 keypad-divide	intro.txt	/*keypad-divide*
 keypad-end	intro.txt	/*keypad-end*
 keypad-enter	intro.txt	/*keypad-enter*
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 4ddd63e..b418e4c 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -1,4 +1,4 @@
-*term.txt*      For Vim version 7.0aa.  Last change: 2004 Jan 09
+*term.txt*      For Vim version 7.0aa.  Last change: 2004 Oct 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -372,9 +372,13 @@
 different modes.  If your terminal supports only one of the modes, both will
 look the same.
 
+							*keypad-comma*
 The keypad keys, when they are not mapped, behave like the equivalent normal
-key.
-							*xterm-codes*
+key.  There is one exception: if you have a comma on the keypad instead of a
+decimal point, Vim will use a dot anyway.  Use these mappings to fix that: >
+	:noremap <kPoint> ,
+	:noremap! <kPoint> ,
+<							*xterm-codes*
 There is a special trick to obtain the key codes which currently only works
 for xterm.  When |t_RV| is defined and a response is received which indicates
 an xterm with patchlevel 141 or higher, Vim uses special escape sequences to
diff --git a/runtime/doc/vim.1 b/runtime/doc/vim.1
index d1fa54a..d58943d 100644
--- a/runtime/doc/vim.1
+++ b/runtime/doc/vim.1
@@ -392,7 +392,7 @@
 Like -w, but an existing file is overwritten.
 .TP
 -x
-Use encryption when writing files.   Will prompt for a crypt key.
+Use encryption when writing files.  Will prompt for a crypt key.
 .TP
 -X
 Don't connect to the X server.  Shortens startup time in a terminal, but the
@@ -415,14 +415,14 @@
 This can be used to edit a filename that starts with a '-'.
 .TP
 --echo-wid
-GTK GUI only: Echo the Window ID on stdout
+GTK GUI only: Echo the Window ID on stdout.
 .TP
 --help
 Give a help message and exit, just like "-h".
 .TP
 --literal
-Take file name arguments literally, do not expand wildcards.  Not needed on
-Unix, the shell expand wildcards.
+Take file name arguments literally, do not expand wildcards.  This has no
+effect on Unix where the shell expands wildcards.
 .TP
 --noplugin
 Skip loading plugins.  Implied by -u NONE.
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 26c222f..c10579e 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2004 Oct 02
+" Last Change:	2004 Oct 14
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -1520,6 +1520,9 @@
 " TF mud client
 au BufNewFile,BufRead *.tf,.tfrc,tfrc		setf tf
 
+" TPP - Text Presentation Program
+au BufNewFile,BufReadPost *.tpp			setf tpp
+
 " TSS - Geometry
 au BufNewFile,BufReadPost *.tssgm		setf tssgm
 
diff --git a/runtime/lang/menu_ja.euc-jp.vim b/runtime/lang/menu_ja.euc-jp.vim
new file mode 100644
index 0000000..0861315
--- /dev/null
+++ b/runtime/lang/menu_ja.euc-jp.vim
@@ -0,0 +1,6 @@
+" Menu Translations:	Japanese (for UNIX)
+" Translated By:	Muraoka Taro  <koron@tka.att.ne.jp>
+" Last Change:		08:50:47 25-Mar-2001.
+
+" eucjp is the same as euc-jp.  Source the other one from here.
+source <sfile>:p:h/menu_ja_jp.euc-jp.vim
diff --git a/runtime/lang/menu_ja.eucjp.vim b/runtime/lang/menu_ja.eucjp.vim
new file mode 100644
index 0000000..0861315
--- /dev/null
+++ b/runtime/lang/menu_ja.eucjp.vim
@@ -0,0 +1,6 @@
+" Menu Translations:	Japanese (for UNIX)
+" Translated By:	Muraoka Taro  <koron@tka.att.ne.jp>
+" Last Change:		08:50:47 25-Mar-2001.
+
+" eucjp is the same as euc-jp.  Source the other one from here.
+source <sfile>:p:h/menu_ja_jp.euc-jp.vim
diff --git a/runtime/syntax/pascal.vim b/runtime/syntax/pascal.vim
index bba198f..d2b6060 100644
--- a/runtime/syntax/pascal.vim
+++ b/runtime/syntax/pascal.vim
@@ -1,13 +1,16 @@
 " Vim syntax file
 " Language:	Pascal
-" Version: 2.7
-" Last Change:	2003 May 11
+" Version: 2.8
+" Last Change:	2004/10/17 17:47:30
 " Maintainer:  Xavier Crégut <xavier.cregut@enseeiht.fr>
 " Previous Maintainer:	Mario Eusebio <bio@dq.fct.unl.pt>
 
-" Contributors: Tim Chase <tchase@csc.com>, Stas Grabois <stsi@vtrails.com>,
+" Contributors: Tim Chase <tchase@csc.com>,
+"	Stas Grabois <stsi@vtrails.com>,
 "	Mazen NEIFER <mazen.neifer.2001@supaero.fr>,
-"	Klaus Hast <Klaus.Hast@arcor.net>
+"	Klaus Hast <Klaus.Hast@arcor.net>,
+"	Austin Ziegler <austin@halostatue.ca>,
+"	Markus Koenig <markus@stber-koenig.de>
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -34,7 +37,20 @@
 syn keyword pascalType		string text variant
 
 
-syn keyword pascalTodo contained	TODO
+    " 20011222az: Added new items.
+syn keyword pascalTodo contained	TODO FIXME XXX DEBUG NOTE
+
+    " 20010723az: When wanted, highlight the trailing whitespace -- this is
+    " based on c_space_errors; to enable, use "pascal_space_errors".
+if exists("pascal_space_errors")
+    if !exists("pascal_no_trail_space_error")
+        syn match pascalSpaceError "\s\+$"
+    endif
+    if !exists("pascal_no_tab_space_error")
+        syn match pascalSpaceError " \+\t"me=e-1
+    endif
+endif
+
 
 
 " String
@@ -93,8 +109,7 @@
   syn match pascalShowTab "\t"
 endif
 
-syn region pascalComment	start="(\*"  end="\*)" contains=pascalTodo
-syn region pascalComment	start="{"  end="}" contains=pascalTodo
+syn region pascalComment	start="(\*\|{"  end="\*)\|}" contains=pascalTodo,pascalSpaceError
 
 
 if !exists("pascal_no_functions")
@@ -113,7 +128,7 @@
 
   if exists("pascal_traditional")
     " These functions do not seem to be defined in Turbo Pascal
-    syn keyword pascalFunction	Get Page Put
+    syn keyword pascalFunction	Get Page Put 
   endif
 
   " ordinal functions
@@ -129,9 +144,9 @@
   syn keyword pascalStatement	constructor destructor implementation inherited
   syn keyword pascalStatement	interface unit uses
   syn keyword pascalModifier	absolute assembler external far forward inline
-  syn keyword pascalModifier	interrupt near virtual
-  syn keyword pascalAcces	private public
-  syn keyword pascalStruct	object
+  syn keyword pascalModifier	interrupt near virtual 
+  syn keyword pascalAcces	private public 
+  syn keyword pascalStruct	object 
   syn keyword pascalOperator	shl shr xor
 
   syn region pascalPreProc	start="(\*\$"  end="\*)" contains=pascalTodo
@@ -151,7 +166,7 @@
   endif
 
   if exists("pascal_fpc")
-    syn region pascalComment	start="//" end="$"
+    syn region pascalComment        start="//" end="$" contains=pascalTodo,pascalSpaceError
     syn keyword pascalStatement	fail otherwise operator
     syn keyword pascalDirective	popstack
     syn keyword pascalPredefined self
@@ -165,7 +180,7 @@
   endif
 
   if exists("pascal_delphi")
-    syn region pascalComment	start="//"  end="$" contains=pascalTodo
+    syn region pascalComment	start="//"  end="$" contains=pascalTodo,pascalSpaceError
     syn keyword pascalType	SmallInt Int64
     syn keyword pascalType	Real48 Currency
     syn keyword pascalType	AnsiChar WideChar
@@ -176,7 +191,7 @@
     syn keyword pascalStruct	class dispinterface
     syn keyword pascalException	try except raise at on finally
     syn keyword pascalStatement	out
-    syn keyword pascalStatement	library package
+    syn keyword pascalStatement	library package 
     syn keyword pascalStatement	initialization finalization uses exports
     syn keyword pascalStatement	property out resourcestring threadvar
     syn keyword pascalModifier	contains
@@ -248,7 +263,7 @@
     syn keyword pascalConstant LightCyan LightRed LightMagenta Yellow White
     syn keyword pascalConstant Blink ScreenWidth ScreenHeight bw40
     syn keyword pascalConstant co40 bw80 co80 mono
-    syn keyword pascalPredefined TextChar
+    syn keyword pascalPredefined TextChar 
 
     " DOS unit
     syn keyword pascalFunction	AddDisk DiskFree DiskSize DosExitCode DosVersion
@@ -333,6 +348,7 @@
   HiLink pascalPredefined	pascalStatement
   HiLink pascalPreProc		PreProc
   HiLink pascalRepeat		Repeat
+  HiLink pascalSpaceError	Error
   HiLink pascalStatement	Statement
   HiLink pascalString		String
   HiLink pascalStringEscape	Special
diff --git a/runtime/syntax/tpp.vim b/runtime/syntax/tpp.vim
new file mode 100644
index 0000000..28a2c6b
--- /dev/null
+++ b/runtime/syntax/tpp.vim
@@ -0,0 +1,91 @@
+" Vim syntax file
+" Language:	tpp - Text Presentation Program
+" Maintainer:	Gerfried Fuchs <alfie@ist.org>
+" Filenames:	*.tpp
+" Last Change:	13. October 2004
+" URL:		http://alfie.ist.org/projects/vim/syntax/tpp.vim
+" License:	BSD
+"
+" Comments are very welcome - but please make sure that you are commenting on
+" the latest version of this file.
+" SPAM is _NOT_ welcome - be ready to be reported!
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'tpp'
+endif
+
+
+"" list of the legal switches/options
+syn match tppAbstractOptionKey contained "^--\%(author\|title\|date\) *" nextgroup=tppValue
+syn match tppPageLocalOptionKey contained "^--\%(heading\|center\|right\|sleep\|huge\|exec\) *" nextgroup=tppValue
+syn match tppPageLocalSwitchKey contained "^--\%(horline\|-\|\%(begin\|end\)\%(\%(shell\)\?output\|slide\%(left\|right\|top\|bottom\)\)\|\%(bold\|rev\|ul\)\%(on\|off\)\|withborder\)"
+syn match tppNewPageOptionKey contained "^--newpage *" nextgroup=tppValue
+syn match tppColorOptionKey contained "^--\%(\%(bg\|fg\)\?color\) *"
+syn match tppTimeOptionKey contained "^--sleep *"
+
+syn match tppValue contained ".*"
+syn match tppColor contained "\%(white\|yellow\|red\|green\|blue\|cyan\|magenta\|black\)"
+syn match tppTime contained "\d\+"
+
+syn region tppPageLocalSwitch start="^--" end="$" contains=tppPageLocalSwitchKey oneline
+syn region tppColorOption start="^--\%(\%(bg\|fg\)\?color\)" end="$" contains=tppColorOptionKey,tppColor oneline
+syn region tppTimeOption start="^--sleep" end="$" contains=tppTimeOptionKey,tppTime oneline
+syn region tppNewPageOption start="^--newpage" end="$" contains=tppNewPageOptionKey oneline
+syn region tppPageLocalOption start="^--\%(heading\|center\|right\|sleep\|huge\|exec\)" end="$" contains=tppPageLocalOptionKey oneline
+syn region tppAbstractOption start="^--\%(author\|title\|date\)" end="$" contains=tppAbstractOptionKey oneline
+
+if main_syntax != 'sh'
+  " shell command
+  if version < 600
+    syn include @tppShExec <sfile>:p:h/sh.vim
+  else
+    syn include @tppShExec syntax/sh.vim
+  endif
+  unlet b:current_syntax
+
+  syn region shExec matchgroup=tppPageLocalOptionKey start='^--exec *' keepend end='$' contains=@tppShExec
+
+endif
+
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_tpp_syn_inits")
+  if version < 508
+    let did_tpp_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink tppAbstractOptionKey		Special
+  HiLink tppPageLocalOptionKey		Keyword
+  HiLink tppPageLocalSwitchKey		Keyword
+  HiLink tppColorOptionKey		Keyword
+  HiLink tppTimeOptionKey		Comment
+  HiLink tppNewPageOptionKey		PreProc
+  HiLink tppValue			String
+  HiLink tppColor			String
+  HiLink tppTime			Number
+  HiLink tppAbstractOption		Error
+  HiLink tppPageLocalOption		Error
+  HiLink tppPageLocalSwitch		Error
+  HiLink tppColorOption			Error
+  HiLink tppNewPageOption		Error
+  HiLink tppTimeOption			Error
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "tpp"
+
+" vim: ts=8 sw=2