Included the patch to support netbeans in a terminal.
diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
index 4d44965..ebe7188 100644
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -115,9 +115,8 @@
In case you do not want the NetBeans interface you can disable it by
uncommenting a line with "--disable-netbeans" in the Makefile.
-Currently, only GVim is supported in this integration as NetBeans does not
-have means to supply a terminal emulator for the Vim command. Furthermore,
-there is only GUI support for GTK, GNOME, and Motif.
+Currently the NetBeans interface is supported by Vim running in a terminal and
+by GVim when it is run with one of the following GUIs: GTK, GNOME, and Motif.
If Motif support is required the user must supply XPM libraries. See
|workshop-xpm| for details on obtaining the latest version of XPM.
@@ -151,6 +150,12 @@
which you cannot change. Also sets the current buffer, if
necessary.
+ *E532*
+The defineAnnoType highlighting color name is too long
+ The maximum length of the "fg" or "bg" color argument in the
+ defineAnnoType command is 32 characters.
+ New in version 2.5.
+
*E656*
Writes of unmodified buffers forbidden
Writes of unmodified buffers that were opened from the
@@ -236,8 +241,8 @@
confusion happening again, netbeans_saved() has been renamed to
netbeans_save_buffer().
-We are now at version 2.4. For the differences between 2.3 and 2.4 search for
-"2.4" below.
+We are now at version 2.5. For the differences between 2.4 and 2.5 search for
+"2.5" below.
The messages are currently sent over a socket. Since the messages are in
plain UTF-8 text this protocol could also be used with any other communication
@@ -304,8 +309,11 @@
number Argument with a decimal number.
-optnum Argument with either a decimal number or "none" (without the
- quotes).
+color Argument with either a decimal number, "none" (without the
+ quotes) or the name of a color (without the quotes) defined
+ both in the color list in|highlight-ctermfg| and in the color
+ list in|gui-colors|.
+ New in version 2.5.
offset A number argument that indicates a byte position in a buffer.
The first byte has offset zero. Line breaks are counted for
@@ -366,9 +374,14 @@
typeName string name that identifies this annotation
tooltip string not used
glyphFile string name of icon file
- fg optnum foreground color for line highlighting
- bg optnum background color for line highlighting
+ fg color foreground color for line highlighting
+ bg color background color for line highlighting
Vim will define a sign for the annotation.
+ When color is a number, this is the "#rrggbb" Red, Green and
+ Blue values of the color (see |gui-colors|) and the
+ highlighting is only defined for GVim.
+ When color is a name, this color is defined both for Vim
+ running in a color terminal and for GVim.
When both "fg" and "bg" are "none" no line highlighting is
used (new in version 2.1).
When "glyphFile" is empty, no text sign is used (new in
@@ -432,6 +445,7 @@
New in version 2.1.
raise Bring the editor to the foreground.
+ Only when Vim is run with a GUI.
New in version 2.1.
removeAnno serNum
@@ -521,6 +535,7 @@
Show a balloon (popup window) at the mouse pointer position,
containing "text", a string argument. The balloon should
disappear when the mouse is moved more than a few pixels.
+ Only when Vim is run with a GUI.
New in version 2.1.
specialKeys
@@ -654,6 +669,7 @@
Used when 'ballooneval' is set and the mouse pointer rests on
some text for a moment. "text" is a string, the text under
the mouse pointer.
+ Only when Vim is run with a GUI.
New in version 2.1.
buttonRelease button lnum col
@@ -803,6 +819,13 @@
NUL bytes are not possible. For editor -> IDE they will appear as NL
characters. For IDE -> editor they cannot be inserted.
+A NetBeans session may be initiated with Vim running in a terminal, and
+continued later in a GUI environment after running the |:gui|command. In this
+case, the highlighting defined for the NetBeans annotations may be cleared
+when the ":gui" command sources .gvimrc and this file loads a colorscheme
+that runs the command ":highlight clear".
+New in version 2.5.
+
==============================================================================
9. Debugging NetBeans protocol *netbeans-debugging*
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index a2d2a4a..0bdde3a 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3786,7 +3786,7 @@
global
{not in Vi}
{only available when compiled with |+xim| and
- |+GUI_GTK|}
+ |+GUI_GTK|} *E599*
Specifies the key that your Input Method in X-Windows uses for
activation. When this is specified correctly, vim can fully control
IM with 'imcmdline', 'iminsert' and 'imsearch'.
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 1b051ff..e46da18 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -3827,6 +3827,7 @@
E53 pattern.txt /*E53*
E530 options.txt /*E530*
E531 options.txt /*E531*
+E532 netbeans.txt /*E532*
E533 options.txt /*E533*
E534 options.txt /*E534*
E535 options.txt /*E535*
@@ -3899,6 +3900,7 @@
E596 options.txt /*E596*
E597 options.txt /*E597*
E598 options.txt /*E598*
+E599 options.txt /*E599*
E60 pattern.txt /*E60*
E600 eval.txt /*E600*
E601 eval.txt /*E601*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index ff19798..c9c7292 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1082,8 +1082,12 @@
Vim 7.3:
Patches to include:
-- Patch to support netbeans in Unix console Vim. (Xavier de Gaye, 2009 Apr
- 26) Now with Mercurial repository (2010 Jan 2)
+- nbstart command patch (Xavier de Gaye)
+ Keep nbkey as the first command in ex_cmds.h
+ NETBEANS_CLOSED -> NETBEANS_OPEN
+ netbeans_closed() -> netbeans_active()
+ do check netbeans_active() when calling netbeans_removed() et al.
+
- Include conceal patch?
http://vince.negri.googlepages.com/
http://vim.wikia.com/wiki/Patch_to_conceal_parts_of_lines
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index a82bf9e..857693c 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -7170,6 +7170,18 @@
Added *added-7.3*
-----
+Added the 'relativenumber' option. (Markus Heidelberg)
+
+Support for Blowfish encryption. Added the 'cryptmethod' option.
+Mostly by Moshin Ahmed.
+
+Added support for NetBeans in a terminal. (Xavier de Gaye)
+
+More floating point functions: acos(), asin(), atan2(), cosh(), exp(), fmod(),
+log(), sinh(), tan(), tanh(). (Bill McCarthy)
+
+gettabvar() and settabvar() functions. (Yegappan Lakshmanan)
+
New syntax files:
TODO
@@ -7181,18 +7193,8 @@
Breton. (Dominique Pelle)
-Added the 'relativenumber' option. (Markus Heidelberg)
-
-Support for Blowfish encryption. Added the 'cryptmethod' option.
-Mostly by Moshin Ahmed.
-
Support GDK_SUPER_MASK for GTK on Mac. (Stephan Schulz)
-More floating point functions: acos(), asin(), atan2(), cosh(), exp(), fmod(),
-log(), sinh(), tan(), tanh(). (Bill McCarthy)
-
-gettabvar() and settabvar() functions. (Yegappan Lakshmanan)
-
Fixed *fixed-7.3*
-----