===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.279
retrieving revision 1.281
diff -u -p -r1.279 -r1.281
--- mandoc/roff.c	2015/10/13 22:59:54	1.279
+++ mandoc/roff.c	2015/10/20 02:01:32	1.281
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.279 2015/10/13 22:59:54 schwarze Exp $ */
+/*	$Id: roff.c,v 1.281 2015/10/20 02:01:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -33,9 +33,6 @@
 #include "roff_int.h"
 #include "libroff.h"
 
-/* Maximum number of nested if-else conditionals. */
-#define	RSTACK_MAX	128
-
 /* Maximum number of string expansions per line, to break infinite loops. */
 #define	EXPAND_LIMIT	1000
 
@@ -1010,6 +1007,11 @@ roff_node_append(struct roff_man *man, struct roff_nod
 
 	switch (man->next) {
 	case ROFF_NEXT_SIBLING:
+		if (man->last->next != NULL) {
+			n->next = man->last->next;
+			man->last->next->prev = n;
+		} else
+			man->last->parent->last = n;
 		man->last->next = n;
 		n->prev = man->last;
 		n->parent = man->last->parent;
@@ -1017,12 +1019,12 @@ roff_node_append(struct roff_man *man, struct roff_nod
 	case ROFF_NEXT_CHILD:
 		man->last->child = n;
 		n->parent = man->last;
+		n->parent->last = n;
 		break;
 	default:
 		abort();
 	}
 	n->parent->nchild++;
-	n->parent->last = n;
 
 	/*
 	 * Copy over the normalised-data pointer of our parent.  Not
@@ -1075,7 +1077,7 @@ roff_word_alloc(struct roff_man *man, int line, int po
 	n->string = roff_strdup(man->roff, word);
 	roff_node_append(man, n);
 	if (man->macroset == MACROSET_MDOC)
-		mdoc_valid_post(man);
+		n->flags |= MDOC_VALID | MDOC_ENDED;
 	else
 		man_valid_post(man);
 	man->next = ROFF_NEXT_SIBLING;
@@ -1163,7 +1165,7 @@ roff_addtbl(struct roff_man *man, const struct tbl_spa
 	n->span = tbl;
 	roff_node_append(man, n);
 	if (man->macroset == MACROSET_MDOC)
-		mdoc_valid_post(man);
+		n->flags |= MDOC_VALID | MDOC_ENDED;
 	else
 		man_valid_post(man);
 	man->next = ROFF_NEXT_SIBLING;