Add :nbstart and :nbclose.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 667c5da..5b5e8fa 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -6047,7 +6047,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.
+netbeans_enabled Compiled with support for |netbeans| and connected.
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/index.txt b/runtime/doc/index.txt
index d8a789a..07c5768 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1321,7 +1321,9 @@
|:mode| :mod[e] show or change the screen mode
|:mzscheme| :mz[scheme] execute MzScheme command
|:mzfile| :mzf[ile] execute MzScheme script file
+|:nbclose| :nbc[lose] close the current Netbeans session
|:nbkey| :nb[key] pass a key to Netbeans
+|:nbstart| :nbs[art] start a new Netbeans session
|:next| :n[ext] go to next file in the argument list
|:new| :new create a new empty window
|:nmap| :nm[ap] like ":map" but for Normal mode
diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
index ebe7188..28c9c99 100644
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -14,7 +14,7 @@
4. Error Messages |netbeans-messages|
5. Running Vim in NetBeans mode |netbeans-run|
6. NetBeans protocol |netbeans-protocol|
-7. NetBeans key |netbeans-key|
+7. NetBeans commands |netbeans-commands|
8. Known problems |netbeans-problems|
9. Debugging NetBeans protocol |netbeans-debugging|
10. NetBeans External Editor
@@ -48,6 +48,8 @@
http://www.a-a-p.org
- Clewn, a gdb integration into Vim, written in C:
http://clewn.sourceforge.net/
+- Pyclewn, a gdb integration into Vim, written in Python:
+ http://pyclewn.sourceforge.net/
- VimPlugin, integration of Vim inside Eclipse:
http://vimplugin.sourceforge.net/wiki/pmwiki.php
- PIDA, IDE written in Python integrating Vim:
@@ -186,25 +188,37 @@
==============================================================================
5. Running Vim in NetBeans mode *netbeans-run*
-Vim must be started with the |-nb| argument. Three forms can be used, that
-differ in the way the information for the connection is specified:
+There are two different ways to run Vim in NetBeans mode:
+
+ + an IDE may start Vim with the|-nb|command line argument
+ + NetBeans can be started from within Vim with the|:nbstart|command
+
+ *netbeans-parameters*
+Three forms can be used to setup the NetBeans connection parameters.
+When started from the command line, the|-nb|command line argument may be:
-nb={fname} from a file
-nb:{hostname}:{addr}:{password} directly
-nb from a file or environment
+When started from within Vim, the|:nbstart|optional argument may be:
+
+ ={fname} from a file
+ :{hostname}:{addr}:{password} directly
+ <MISSING ARGUMENT> from a file or environment
+
*E660* *E668*
-For security reasons, the best method is to write the information in a file
-readable only by the user. The name of the file can be passed with the
-"-nb={fname}" argument or, when "-nb" is used without a parameter, the
-environment variable "__NETBEANS_CONINFO". The file must contain these three
-lines, in any order:
+When NetBeans is started from the command line, for security reasons, the best
+method is to write the information in a file readable only by the user. The
+name of the file can be passed with the "-nb={fname}" argument or, when "-nb"
+is used without a parameter, the environment variable "__NETBEANS_CONINFO".
+The file must contain these three lines, in any order:
host={hostname}
port={addr}
auth={password}
-Other lines are ignored. The caller of Vim is responsible for deleting the
+Other lines are ignored. The Vim Controller is responsible for deleting the
file afterwards.
{hostname} is the name of the machine where Vim Controller is running. When
@@ -803,10 +817,22 @@
==============================================================================
-7. NetBeans key *netbeans-key*
+7. NetBeans commands *netbeans-commands*
+
+ *:nbstart* *E511*
+:nbs[tart] {connection} Start a new Netbeans session with {connection} as the
+ socket connection parameters. The format of
+ {connection} is described in|netbeans-parameters|.
+ At any time, one may check if the netbeans socket is
+ connected by running the command:
+ ':echo has("netbeans_enabled")'
+
+ *:nbclose*
+:nbc[lose] Close the current NetBeans session. Remove all placed
+ signs.
*:nbkey*
-:nbkey key Pass the key to the Vim Controller for processing
+:nb[key] {key} Pass the {key} to the Vim Controller for processing
When a hot-key has been installed with the specialKeys command, this command
can be used to generate a hotkey messages to the Vim Controller. The events
diff --git a/runtime/doc/tags b/runtime/doc/tags
index e46da18..259933e 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -2417,7 +2417,9 @@
:mzfile if_mzsch.txt /*:mzfile*
:mzscheme if_mzsch.txt /*:mzscheme*
:n editing.txt /*:n*
+:nbclose netbeans.txt /*:nbclose*
:nbkey netbeans.txt /*:nbkey*
+:nbstart netbeans.txt /*:nbstart*
:ne editing.txt /*:ne*
:new windows.txt /*:new*
:next editing.txt /*:next*
@@ -3805,6 +3807,7 @@
E509 editing.txt /*E509*
E51 pattern.txt /*E51*
E510 editing.txt /*E510*
+E511 netbeans.txt /*E511*
E512 editing.txt /*E512*
E513 options.txt /*E513*
E514 editing.txt /*E514*
@@ -6541,14 +6544,15 @@
nb-terms netbeans.txt /*nb-terms*
ncf.vim syntax.txt /*ncf.vim*
netbeans netbeans.txt /*netbeans*
+netbeans-commands netbeans.txt /*netbeans-commands*
netbeans-configure netbeans.txt /*netbeans-configure*
netbeans-debugging netbeans.txt /*netbeans-debugging*
netbeans-download netbeans.txt /*netbeans-download*
netbeans-integration netbeans.txt /*netbeans-integration*
netbeans-intro netbeans.txt /*netbeans-intro*
-netbeans-key netbeans.txt /*netbeans-key*
netbeans-keybindings netbeans.txt /*netbeans-keybindings*
netbeans-messages netbeans.txt /*netbeans-messages*
+netbeans-parameters netbeans.txt /*netbeans-parameters*
netbeans-preparation netbeans.txt /*netbeans-preparation*
netbeans-problems netbeans.txt /*netbeans-problems*
netbeans-protocol netbeans.txt /*netbeans-protocol*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index c9c7292..a109c2e 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1082,12 +1082,6 @@
Vim 7.3:
Patches to include:
-- 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 857693c..a6e1f61 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -7175,7 +7175,8 @@
Support for Blowfish encryption. Added the 'cryptmethod' option.
Mostly by Moshin Ahmed.
-Added support for NetBeans in a terminal. (Xavier de Gaye)
+Added support for NetBeans in a terminal. Added |:nbstart| and |:nbclose|.
+(Xavier de Gaye)
More floating point functions: acos(), asin(), atan2(), cosh(), exp(), fmod(),
log(), sinh(), tan(), tanh(). (Bill McCarthy)