updated for version 7.3.016
Problem: Netbeans doesn't work under Athena.
Solution: Support Athena, just like Motif. (Xavier de Gaye)
diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
index 4d109a5..63f447e 100644
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -1,4 +1,4 @@
-*netbeans.txt* For Vim version 7.3. Last change: 2010 Jul 20
+*netbeans.txt* For Vim version 7.3. Last change: 2010 Aug 20
VIM REFERENCE MANUAL by Gordon Prieur et al.
@@ -118,7 +118,8 @@
uncommenting a line with "--disable-netbeans" in the Makefile.
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.
+by GVim when it is run with one of the following GUIs: GTK, GNOME, Windows,
+Athena 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.
diff --git a/src/gui.c b/src/gui.c
index 87930c6..6029e3b 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -2352,7 +2352,7 @@
if (draw_sign)
/* Draw the sign on top of the spaces. */
gui_mch_drawsign(gui.row, col, gui.highlight_mask);
-# if defined(FEAT_NETBEANS_INTG) && (defined(FEAT_GUI_MOTIF) \
+# if defined(FEAT_NETBEANS_INTG) && (defined(FEAT_GUI_X11) \
|| defined(FEAT_GUI_GTK) || defined(FEAT_GUI_W32))
if (multi_sign)
netbeans_draw_multisign_indicator(gui.row);
diff --git a/src/main.c b/src/main.c
index 435e607..cc99d1f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -940,7 +940,7 @@
if (netbeansArg != NULL && strncmp("-nb", netbeansArg, 3) == 0)
{
# ifdef FEAT_GUI
-# if !defined(FEAT_GUI_MOTIF) && !defined(FEAT_GUI_GTK) \
+# if !defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK) \
&& !defined(FEAT_GUI_W32)
if (gui.in_use)
{
diff --git a/src/netbeans.c b/src/netbeans.c
index d75fcbb..f39111d 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -87,7 +87,7 @@
static void nb_init_graphics __ARGS((void));
static void coloncmd __ARGS((char *cmd, ...));
static void nb_set_curbuf __ARGS((buf_T *buf));
-#ifdef FEAT_GUI_MOTIF
+#ifdef FEAT_GUI_X11
static void messageFromNetbeans __ARGS((XtPointer, int *, XtInputId *));
#endif
#ifdef FEAT_GUI_GTK
@@ -112,7 +112,7 @@
static NBSOCK nbsock = -1; /* socket fd for Netbeans connection */
#define NETBEANS_OPEN (nbsock != -1)
-#ifdef FEAT_GUI_MOTIF
+#ifdef FEAT_GUI_X11
static XtInputId inputHandler = (XtInputId)NULL; /* Cookie for input */
#endif
#ifdef FEAT_GUI_GTK
@@ -143,7 +143,7 @@
netbeans_send_disconnect();
-#ifdef FEAT_GUI_MOTIF
+#ifdef FEAT_GUI_X11
if (inputHandler != (XtInputId)NULL)
{
XtRemoveInput(inputHandler);
@@ -700,7 +700,7 @@
/*
* Read a command from netbeans.
*/
-#ifdef FEAT_GUI_MOTIF
+#ifdef FEAT_GUI_X11
static void
messageFromNetbeans(XtPointer clientData UNUSED,
int *unused1 UNUSED,
@@ -2937,7 +2937,7 @@
if (!NB_HAS_GUI || !NETBEANS_OPEN)
return;
-# ifdef FEAT_GUI_MOTIF
+# ifdef FEAT_GUI_X11
/* tell notifier we are interested in being called
* when there is input on the editor connection socket
*/
@@ -3027,7 +3027,7 @@
}
}
-#if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_W32) || defined(PROTO)
+#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_W32) || defined(PROTO)
/*
* Tell netbeans that the window was moved or resized.
*/
@@ -3458,7 +3458,7 @@
return FALSE;
}
-#if defined(FEAT_GUI_MOTIF) || defined(PROTO)
+#if defined(FEAT_GUI_X11) || defined(PROTO)
/*
* We have multiple signs to draw at the same location. Draw the
* multi-sign indicator instead. This is the Motif version.
@@ -3487,7 +3487,7 @@
XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+3, y++);
XDrawPoint(gui.dpy, gui.wid, gui.text_gc, x+2, y);
}
-#endif /* FEAT_GUI_MOTIF */
+#endif /* FEAT_GUI_X11 */
#if defined(FEAT_GUI_GTK) && !defined(PROTO)
/*
diff --git a/src/version.c b/src/version.c
index e24fb6b..b3fc12e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 16,
+/**/
15,
/**/
14,