updated for version 7.0020

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_byte_ime		Compiled with support for IME input method.
 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|

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 @@ and the level given by the marker:
 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.
+The number indicates the fold level.  A zero cannot be used (a marker with
-You can use "}}}" with a digit to indicate the level of the fold that
+level zero is ignored).  You can use "}}}" with a digit to indicate the level
-ends.  The fold level of the following line will be one less than the
+of the fold that ends.  The fold level of the following line will be one less
-indicated level.  Note that Vim doesn't look back to the level of the matching
+than the indicated level.  Note that Vim doesn't look back to the level of the
-marker (that would take too much time).  Example: >
+matching marker (that would take too much time).  Example: >
 
 	{{{1
 	fold level here is 1

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 @@ results. This is a list of comma-separated values. Each item consists of
 '-' 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

runtime/doc/netbeans.txt

@@ -417,6 +417,12 @@ guard off len
 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 @@ save		Save the buffer when it was modified.  The other side of the
 		- '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 @@ setExitDelay seconds
 		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 @@ setModified modified
 		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 @@ showBalloon text
 		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 @@ buttonRelease button lnum col
 		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.

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 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  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 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  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 @@ A jump table for the options with a short description can be found at |Q_op|.
 			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
+	splitting or closing a window.  This also happens the moment the
-	reduce the size of the current window and leave the other windows the
+	option is switched on.  When off, splitting a window will reduce the
-	same.  When closing a window the extra lines are given to the window
+	size of the current window and leave the other windows the same.  When
-	next to it (depending on 'splitbelow' and 'splitright').
+	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.

runtime/doc/tags

@@ -5223,6 +5223,7 @@ keymap-file-format	mbyte.txt	/*keymap-file-format*
 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*

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 @@ If your terminal supports both inversion and standout mode, you can see two
 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.
+key.  There is one exception: if you have a comma on the keypad instead of a
-							*xterm-codes*
+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

runtime/doc/vim.1

@@ -392,7 +392,7 @@ If the {scriptout} file exists, characters are appended.
 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 @@ Arguments after this will be handled as a file name.
 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
+Take file name arguments literally, do not expand wildcards.  This has no
-Unix, the shell expand wildcards.
+effect on Unix where the shell expands wildcards.
 .TP
 --noplugin
 Skip loading plugins.  Implied by -u NONE.

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 @@ au BufNewFile,BufRead .tidyrc,tidyrc		setf tidy
 " 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
 

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

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

runtime/syntax/pascal.vim

@@ -1,13 +1,16 @@
 " Vim syntax file
 " Language:	Pascal
-" Version: 2.7
+" Version: 2.8
-" Last Change:	2003 May 11
+" Last Change:	2004/10/17 17:47:30
 " Maintainer:  Xavier Cr<43>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		array boolean char integer file pointer real set
 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 @@ if exists("pascal_no_tabs")
   syn match pascalShowTab "\t"
 endif
 
-syn region pascalComment	start="(\*"  end="\*)" contains=pascalTodo
+syn region pascalComment	start="(\*\|{"  end="\*)\|}" contains=pascalTodo,pascalSpaceError
-syn region pascalComment	start="{"  end="}" contains=pascalTodo
 
 
 if !exists("pascal_no_functions")
@@ -113,7 +128,7 @@ if !exists("pascal_no_functions")
 
   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 @@ if !exists("pascal_traditional")
   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 pascalModifier	interrupt near virtual 
-  syn keyword pascalAcces	private public
+  syn keyword pascalAcces	private public 
-  syn keyword pascalStruct	object
+  syn keyword pascalStruct	object 
   syn keyword pascalOperator	shl shr xor
 
   syn region pascalPreProc	start="(\*\$"  end="\*)" contains=pascalTodo
@@ -151,7 +166,7 @@ if !exists("pascal_traditional")
   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 @@ if !exists("pascal_traditional")
   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 @@ if !exists("pascal_traditional")
     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 @@ if !exists("pascal_traditional")
     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 @@ if version >= 508 || !exists("did_pascal_syn_inits")
   HiLink pascalPredefined	pascalStatement
   HiLink pascalPreProc		PreProc
   HiLink pascalRepeat		Repeat
+  HiLink pascalSpaceError	Error
   HiLink pascalStatement	Statement
   HiLink pascalString		String
   HiLink pascalStringEscape	Special

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

src/buffer.c

@@ -1413,6 +1413,12 @@ enter_buffer(buf)
 #endif
 	scroll_cursor_halfway(FALSE);	/* redisplay at correct position */
 
+#ifdef FEAT_NETBEANS_INTG
+    /* Send fileOpened event because we've changed buffers. */
+    if (usingNetbeans && isNetbeansBuffer(curbuf))
+	netbeans_file_activated(curbuf);
+#endif
+
 #if defined(FEAT_NETBEANS_INTG) || defined(FEAT_SUN_WORKSHOP)
     /* Change directories when the acd option is set on. */
     if (p_acd && curbuf->b_ffname != NULL

src/edit.c

@@ -7478,6 +7478,15 @@ ins_tab()
 		    for (temp = i; --temp >= 0; )
 			replace_join(repl_off);
 	    }
+#ifdef FEAT_NETBEANS_INTG
+	    if (usingNetbeans)
+	    {
+		netbeans_removed(curbuf, fpos.lnum, cursor->col,
+							       (long)(i + 1));
+		netbeans_inserted(curbuf, fpos.lnum, cursor->col,
+							   (char_u *)"\t", 1);
+	    }
+#endif
 	    cursor->col -= i;
 
 #ifdef FEAT_VREPLACE

src/ex_docmd.c

@@ -406,6 +406,9 @@ static void	ex_folddo __ARGS((exarg_T *eap));
 #ifndef FEAT_SUN_WORKSHOP
 # define ex_wsverb		ex_ni
 #endif
+#ifndef FEAT_NETBEANS_INTG
+# define ex_nbkey		ex_ni
+#endif
 
 #ifndef FEAT_EVAL
 # define ex_debug		ex_ni

src/ex_getln.c

@@ -2892,6 +2892,7 @@ nextwild(xp, type, options)
     vim_free(p2);
 
     redrawcmd();
+    cursorcmd();
 
     /* When expanding a ":map" command and no matches are found, assume that
      * the key is supposed to be inserted literally */

src/fileio.c

@@ -61,9 +61,7 @@ static char_u *check_for_cryptkey __ARGS((char_u *cryptkey, char_u *ptr, long *s
 #ifdef UNIX
 static void set_file_time __ARGS((char_u *fname, time_t atime, time_t mtime));
 #endif
-static void msg_add_fname __ARGS((buf_T *, char_u *));
 static int msg_add_fileformat __ARGS((int eol_type));
-static void msg_add_lines __ARGS((int, long, long));
 static void msg_add_eol __ARGS((void));
 static int check_mtime __ARGS((buf_T *buf, struct stat *s));
 static int time_differs __ARGS((long t1, long t2));
@@ -2867,7 +2865,9 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
 	     */
 	    if (buf->b_changed || isNetbeansModified(buf))
 	    {
-		netbeans_save_buffer(buf);
+		--no_wait_return;		/* may wait for return now */
+		msg_scroll = msg_save;
+		netbeans_save_buffer(buf);	/* no error checking... */
 		return retval;
 	    }
 	    else
@@ -4403,7 +4403,7 @@ nofail:
 /*
  * Put file name into IObuff with quotes.
  */
-    static void
+    void
 msg_add_fname(buf, fname)
     buf_T	*buf;
     char_u	*fname;
@@ -4450,7 +4450,7 @@ msg_add_fileformat(eol_type)
 /*
  * Append line and character count to IObuff.
  */
-    static void
+    void
 msg_add_lines(insert_space, lnum, nchars)
     int	    insert_space;
     long    lnum;
@@ -5918,6 +5918,9 @@ buf_check_timestamp(buf, focus)
 	    || buf->b_saving
 #ifdef FEAT_AUTOCMD
 	    || busy
+#endif
+#ifdef FEAT_NETBEANS_INTG
+	    || isNetbeansBuffer(buf)
 #endif
 	    )
 	return 0;

src/fold.c

@@ -1925,7 +1925,6 @@ get_foldtext(wp, lnum, lnume, foldinfo, buf)
 	win_T	*save_curwin;
 	int	level;
 	char_u	*p;
-	int	len;
 
 	/* Set "v:foldstart" and "v:foldend". */
 	set_vim_var_nr(VV_FOLDSTART, lnum);
@@ -1959,6 +1958,8 @@ get_foldtext(wp, lnum, lnume, foldinfo, buf)
 	    for (p = text; *p != NUL; ++p)
 	    {
 # ifdef FEAT_MBYTE
+		int	len;
+
 		if (has_mbyte && (len = (*mb_ptr2len_check)(p)) > 1)
 		{
 		    if (!vim_isprintc((*mb_ptr2char)(p)))

src/globals.h

@@ -1389,6 +1389,7 @@ EXTERN char_u e_invexprmsg[]	INIT(=N_("E449: Invalid expression received"));
 #endif
 #ifdef FEAT_NETBEANS_INTG
 EXTERN char_u e_guarded[]	INIT(=N_("E463: Region is guarded, cannot modify"));
+EXTERN char_u e_nbreadonly[]	INIT(=N_("E680: NetBeans does not allow changes in read-only files"));
 #endif
 #ifdef MACOS_X_UNIX
 EXTERN short disallow_gui	INIT(= FALSE);

src/gui_w32.c

@@ -1224,10 +1224,6 @@ gui_mch_init(void)
     s_findrep_struct.wFindWhatLen = MSWIN_FR_BUFSIZE;
     s_findrep_struct.wReplaceWithLen = MSWIN_FR_BUFSIZE;
 #endif
-#ifdef FEAT_NETBEANS_INTG
-    if (usingNetbeans)
-	netbeans_w32_connect();
-#endif
 
     return OK;
 }

src/nbdebug.c

@@ -94,7 +94,6 @@ nbdebug_log_init(
 		} else {
 			nb_dlevel = NB_TRACE;	/* default level */
 		}
-		/* XSetErrorHandler(errorHandler); */
 	}
 
 }    /* end nbdebug_log_init */
@@ -126,7 +125,7 @@ nbdbg(
 {
 	va_list		 ap;
 
-	if (nb_debug != NULL) {
+	if (nb_debug != NULL && nb_dlevel & NB_TRACE) {
 		va_start(ap, fmt);
 		vfprintf(nb_debug, fmt, ap);
 		va_end(ap);
@@ -136,6 +135,23 @@ nbdbg(
 }    /* end nbdbg */
 
 
+void
+nbprt(
+	char		*fmt,
+	...)
+{
+	va_list		 ap;
+
+	if (nb_debug != NULL && nb_dlevel & NB_PRINT) {
+		va_start(ap, fmt);
+		vfprintf(nb_debug, fmt, ap);
+		va_end(ap);
+		fflush(nb_debug);
+	}
+
+}    /* end nbprt */
+
+
 static int
 lookup(
 	char		*file)

src/nbdebug.h

@@ -24,10 +24,12 @@
 #endif
 
 #define nbdebug(a) nbdbg##a
+#define nbprint(a) nbprt##a
 
 #define NB_TRACE		0x00000001
 #define NB_TRACE_VERBOSE	0x00000002
 #define NB_TRACE_COLONCMD	0x00000004
+#define NB_PRINT		0x00000008
 #define NB_DEBUG_ALL		0xffffffff
 
 #define NBDLEVEL(flags)		(nb_debug != NULL && (nb_dlevel & (flags)))
@@ -43,6 +45,7 @@ typedef enum {
 
 
 void		 nbdbg(char *, ...);
+void		 nbprt(char *, ...);
 void		 nbtrace(char *, ...);
 
 void nbdebug_wait __ARGS((u_int wait_flags, char *wait_var, u_int wait_secs));
@@ -58,7 +61,7 @@ extern u_int	 nb_dlevel;		/* nb_debug verbosity level */
 #endif
 
 /*
- * The following 2 stubs are needed because a macro cannot be used because of
+ * The following 3 stubs are needed because a macro cannot be used because of
  * the variable number of arguments.
  */
 
@@ -69,6 +72,12 @@ nbdbg(
 {
 }
 
+void
+nbprt(
+	char		*fmt,
+	...)
+{
+}
 
 void
 nbtrace(

src/normal.c

@@ -6342,8 +6342,10 @@ nv_replace(cap)
 	    {
 		colnr_T start = (colnr_T)(curwin->w_cursor.col - cap->count1);
 
+		netbeans_removed(curbuf, curwin->w_cursor.lnum, start,
+							    (long)cap->count1);
 		netbeans_inserted(curbuf, curwin->w_cursor.lnum, start,
-			     (int)cap->count1, &ptr[start], (int)cap->count1);
+					       &ptr[start], (int)cap->count1);
 	    }
 #endif
 
@@ -6538,8 +6540,10 @@ n_swapchar(cap)
 		    {
 			ptr = ml_get(pos.lnum);
 			count = STRLEN(ptr) - pos.col;
+			netbeans_removed(curbuf, pos.lnum, pos.col,
+								 (long)count);
 			netbeans_inserted(curbuf, pos.lnum, pos.col,
-						 count, &ptr[pos.col], count);
+							&ptr[pos.col], count);
 		    }
 		    pos.col = 0;
 		    pos.lnum++;
@@ -6563,8 +6567,8 @@ n_swapchar(cap)
     {
 	ptr = ml_get(pos.lnum);
 	count = curwin->w_cursor.col - pos.col;
-	netbeans_inserted(curbuf, pos.lnum, pos.col,
+	netbeans_removed(curbuf, pos.lnum, pos.col, (long)count);
-						 count, &ptr[pos.col], count);
+	netbeans_inserted(curbuf, pos.lnum, pos.col, &ptr[pos.col], count);
     }
 #endif
 

src/ops.c

@@ -2132,8 +2132,10 @@ op_tilde(oap)
 	    {
 		char_u *ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
 
+		netbeans_removed(curbuf, pos.lnum, bd.textcol,
+							    (long)bd.textlen);
 		netbeans_inserted(curbuf, pos.lnum, bd.textcol,
-				    bd.textlen, &ptr[bd.textcol], bd.textlen);
+				    &ptr[bd.textcol], bd.textlen);
 	    }
 # endif
 	}
@@ -2175,15 +2177,17 @@ op_tilde(oap)
 		{
 		    ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
 		    count = STRLEN(ptr) - pos.col;
+		    netbeans_removed(curbuf, pos.lnum, pos.col, (long)count);
 		    netbeans_inserted(curbuf, pos.lnum, pos.col,
-						 count, &ptr[pos.col], count);
+						 &ptr[pos.col], count);
 		    pos.col = 0;
 		    pos.lnum++;
 		}
 		ptr = ml_get_buf(curbuf, pos.lnum, FALSE);
 		count = oap->end.col - pos.col + 1;
+		netbeans_removed(curbuf, pos.lnum, pos.col, (long)count);
 		netbeans_inserted(curbuf, pos.lnum, pos.col,
-						 count, &ptr[pos.col], count);
+						 &ptr[pos.col], count);
 	    }
 #endif
 	}

src/os_unix.c

@@ -959,6 +959,12 @@ deathtrap SIGDEFARG(sigarg)
 #endif
     preserve_exit();		    /* preserve files and exit */
 
+#ifdef NBDEBUG
+    reset_signals();
+    may_core_dump();
+    abort();
+#endif
+
     SIGRETURN;
 }
 
@@ -2704,6 +2710,10 @@ mch_exit(r)
 	return;
 #endif
 
+#ifdef FEAT_NETBEANS_INTG
+    if (usingNetbeans)
+	netbeans_send_disconnect();
+#endif
     exit(r);
 }
 

src/proto/fileio.pro

@@ -3,6 +3,8 @@ void filemess __ARGS((buf_T *buf, char_u *name, char_u *s, int attr));
 int readfile __ARGS((char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_skip, linenr_T lines_to_read, exarg_T *eap, int flags));
 int prep_exarg __ARGS((exarg_T *eap, buf_T *buf));
 int buf_write __ARGS((buf_T *buf, char_u *fname, char_u *sfname, linenr_T start, linenr_T end, exarg_T *eap, int append, int forceit, int reset_changed, int filtering));
+void msg_add_fname __ARGS((buf_T *buf, char_u *fname));
+void msg_add_lines __ARGS((int insert_space, long lnum, long nchars));
 char_u *shorten_fname __ARGS((char_u *full_path, char_u *dir_name));
 void shorten_fnames __ARGS((int force));
 void shorten_filenames __ARGS((char_u **fnames, int count));

src/proto/netbeans.pro

@@ -1,16 +1,16 @@
 /* netbeans.c */
-void netbeans_Xt_connect __ARGS((void *context));
-void netbeans_gtk_connect __ARGS((void));
-void netbeans_w32_connect __ARGS((void));
 void messageFromNetbeansW32 __ARGS((void));
 int isNetbeansBuffer __ARGS((buf_T *bufp));
 int isNetbeansModified __ARGS((buf_T *bufp));
 void netbeans_end __ARGS((void));
+void ex_nbkey __ARGS((exarg_T *eap));
 void netbeans_startup_done __ARGS((void));
+void netbeans_send_disconnect __ARGS((void));
 void netbeans_frame_moved __ARGS((int new_x, int new_y));
-void netbeans_file_opened __ARGS((char *filename));
+void netbeans_file_activated __ARGS((buf_T *bufp));
+void netbeans_file_opened __ARGS((buf_T *bufp));
 void netbeans_file_closed __ARGS((buf_T *bufp));
-void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, int oldlen, char_u *txt, int newlen));
+void netbeans_inserted __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, char_u *txt, int newlen));
 void netbeans_removed __ARGS((buf_T *bufp, linenr_T linenr, colnr_T col, long len));
 void netbeans_unmodified __ARGS((buf_T *bufp));
 void netbeans_button_release __ARGS((int button));

src/screen.c

@@ -2019,7 +2019,6 @@ fold_line(wp, fold_count, foldinfo, lnum, row)
     pos_T	*top, *bot;
     linenr_T	lnume = lnum + fold_count - 1;
     int		len;
-    char_u	*p;
     char_u	*text;
     int		fdc;
     int		col;
@@ -2154,6 +2153,7 @@ fold_line(wp, fold_count, foldinfo, lnum, row)
 	int	u8c, u8c_c1, u8c_c2;
 	int	idx;
 	int	c_len;
+	char_u	*p;
 # ifdef FEAT_ARABIC
 	int	prev_c = 0;		/* previous Arabic character */
 	int	prev_c1 = 0;		/* first composing char for prev_c */

src/undo.c

@@ -185,10 +185,18 @@ u_savecommon(top, bot, newbot)
      * Netbeans defines areas that cannot be modified.  Bail out here when
      * trying to change text in a guarded area.
      */
-    if (usingNetbeans && netbeans_is_guarded(top, bot))
+    if (usingNetbeans)
     {
-	EMSG(_(e_guarded));
+	if (netbeans_is_guarded(top, bot))
-	return FAIL;
+	{
+	    EMSG(_(e_guarded));
+	    return FAIL;
+	}
+	if (curbuf->b_p_ro)
+	{
+	    EMSG(_(e_nbreadonly));
+	    return FAIL;
+	}
     }
 #endif
 
@@ -693,6 +701,10 @@ u_undoredo()
     if (old_flags & UH_CHANGED)
 	changed();
     else
+#ifdef FEAT_NETBEANS_INTG
+	/* per netbeans undo rules, keep it as modified */
+	if (!isNetbeansModified(curbuf))
+#endif
 	unchanged(curbuf, FALSE);
 
     /*

src/vim.h

@@ -1784,6 +1784,7 @@ typedef int VimClipboard;	/* This is required for the prototypes. */
 # include "nbdebug.h"
 #else
 # define nbdebug(a)
+# define nbprint(a)
 #endif
 
 #ifdef IN_PERL_FILE