commit e0874f8cbcddfcf9965a85ba35199964efb1d01a
author Bram Moolenaar <Bram@vim.org> Sun Jan 24 20:36:41 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Sun Jan 24 20:36:41 2016 +0100
tree 02cba2d1d135a96e3983f0676bb11da770ab0426
parent 705ada1aff27ecd9c47c690df817d043c2ceb5e2

patch 7.4.1169
Problem:    The socket I/O is intertwined with the netbeans code.
Solution:   Start refactoring the netbeans communication to split off the
            socket I/O.  Add the +channel feature.

src/ui.c

diff --git a/src/ui.c b/src/ui.c
index f622f04..9bcf80b 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1562,7 +1562,7 @@
  * descriptions which would otherwise overflow.  The buffer is considered full
  * when only this extra space (or part of it) remains.
  */
-#if defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG) \
+#if defined(FEAT_SUN_WORKSHOP) || defined(FEAT_CHANNEL) \
 	|| defined(FEAT_CLIENTSERVER)
    /*
     * Sun WorkShop and NetBeans stuff debugger commands into the input buffer.