===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_macro.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- src/usr.bin/mandoc/man_macro.c	2011/07/05 04:12:41	1.30
+++ src/usr.bin/mandoc/man_macro.c	2011/07/07 04:08:01	1.31
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.30 2011/07/05 04:12:41 schwarze Exp $ */
+/*	$Id: man_macro.c,v 1.31 2011/07/07 04:08:01 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -116,6 +116,9 @@
 
 	assert(to);
 
+	assert(MAN_ROOT != m->last->type);
+	m->next = MAN_NEXT_SIBLING;
+
 	/* LINTED */
 	while (m->last != to) {
 		/*
@@ -136,9 +139,6 @@
 	if ( ! man_valid_post(m))
 		return(0);
 
-	m->next = MAN_ROOT == m->last->type ? 
-		MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
-
 	return(1);
 }
 
@@ -424,6 +424,9 @@
 		assert( ! (MAN_SCOPED & man_macros[tok].flags));
 		m->flags |= MAN_ILINE;
 	}
+
+	assert(MAN_ROOT != m->last->type);
+	m->next = MAN_NEXT_SIBLING;
 	
 	/*
 	 * Rewind our element scope.  Note that when TH is pruned, we'll
@@ -448,9 +451,6 @@
 
 	if (m->last->type != MAN_ROOT && ! man_valid_post(m))
 		return(0);
-
-	m->next = MAN_ROOT == m->last->type ?
-		MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
 
 	return(1);
 }