summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/netbeans.c10
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 2 deletions
diff --git a/src/netbeans.c b/src/netbeans.c
index 7ba8d8dc2..3134db9d2 100644
--- a/src/netbeans.c
+++ b/src/netbeans.c
@@ -643,6 +643,7 @@ netbeans_parse_messages(void)
{
char_u *p;
queue_T *node;
+ int own_node;
while (head.next != NULL && head.next != &head)
{
@@ -681,20 +682,25 @@ netbeans_parse_messages(void)
*p++ = NUL;
if (*p == NUL)
{
+ own_node = TRUE;
head.next = node->next;
node->next->prev = node->prev;
}
+ else
+ own_node = FALSE;
/* now, parse and execute the commands */
nb_parse_cmd(node->buffer);
- if (*p == NUL)
+ if (own_node)
{
/* buffer finished, dispose of the node and buffer */
vim_free(node->buffer);
vim_free(node);
}
- else
+ /* Check that "head" wasn't changed under our fingers, e.g. when a
+ * DETACH command was handled. */
+ else if (head.next == node)
{
/* more follows, move to the start */
STRMOVE(node->buffer, p);
diff --git a/src/version.c b/src/version.c
index 85128805f..9d414e803 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 73,
+/**/
72,
/**/
71,