aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/memline.c3
-rw-r--r--src/misc1.c5
-rw-r--r--src/misc2.c1
-rw-r--r--src/ui.c10
-rw-r--r--src/version.c2
5 files changed, 2 insertions, 19 deletions
diff --git a/src/memline.c b/src/memline.c
index c1375a1a85..737e8e6a02 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -2974,8 +2974,7 @@ static void ml_flush_line(buf_T *buf)
return; /* nothing to do */
if (buf->b_ml.ml_flags & ML_LINE_DIRTY) {
- /* This code doesn't work recursively, but Netbeans may call back here
- * when obtaining the cursor position. */
+ /* This code doesn't work recursively. */
if (entered)
return;
entered = TRUE;
diff --git a/src/misc1.c b/src/misc1.c
index ea3763f929..0dd6e2766b 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -1710,10 +1710,7 @@ del_bytes (
/*
* If the old line has been allocated the deletion can be done in the
- * existing line. Otherwise a new line has to be allocated
- * Can't do this when using Netbeans, because we would need to invoke
- * netbeans_removed(), which deallocates the line. Let ml_replace() take
- * care of notifying Netbeans.
+ * existing line. Otherwise a new line has to be allocated.
*/
was_alloced = ml_line_alloced(); /* check if oldp was allocated */
if (was_alloced)
diff --git a/src/misc2.c b/src/misc2.c
index e97d838477..e4622c8e48 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1293,7 +1293,6 @@ int get_real_state(void)
#if defined(FEAT_SESSION) || defined(MSWIN) || defined(FEAT_GUI_MAC) \
|| ((defined(FEAT_GUI_GTK)) \
&& ( defined(FEAT_WINDOWS) || defined(FEAT_DND)) ) \
- || defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG) \
|| defined(PROTO)
/*
* Change to a file's directory.
diff --git a/src/ui.c b/src/ui.c
index 0c9a86d618..8cc123a3e3 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -292,17 +292,7 @@ void ui_breakcheck(void)
* 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) \
- || defined(FEAT_CLIENTSERVER)
-/*
- * Sun WorkShop and NetBeans stuff debugger commands into the input buffer.
- * This requires a larger buffer...
- * (Madsen) Go with this for remote input as well ...
- */
-# define INBUFLEN 4096
-#else
# define INBUFLEN 250
-#endif
static char_u inbuf[INBUFLEN + MAX_KEY_CODE_LEN];
static int inbufcount = 0; /* number of chars in inbuf[] */
diff --git a/src/version.c b/src/version.c
index a747296ae0..0dbe10d0ba 100644
--- a/src/version.c
+++ b/src/version.c
@@ -138,7 +138,6 @@ static char *(features[]) = {
"+multi_byte",
"+multi_lang",
"-mzscheme",
- "-netbeans_intg",
"+path_extra",
"-perl",
"+persistent_undo",
@@ -161,7 +160,6 @@ static char *(features[]) = {
"-startuptime",
#endif // ifdef STARTUPTIME
"+statusline",
- "-sun_workshop",
"+syntax",
"+tag_binary",
"+tag_old_static",