===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.98
retrieving revision 1.100
diff -u -p -r1.98 -r1.100
--- mandoc/mdoc_macro.c	2010/12/06 11:01:19	1.98
+++ mandoc/mdoc_macro.c	2011/01/12 17:00:07	1.100
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.98 2010/12/06 11:01:19 kristaps Exp $ */
+/*	$Id: mdoc_macro.c,v 1.100 2011/01/12 17:00:07 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -252,16 +252,26 @@ lookup_raw(const char *p)
 static int
 rew_last(struct mdoc *mdoc, const struct mdoc_node *to)
 {
+	struct mdoc_node *n, *np;
 
 	assert(to);
 	mdoc->next = MDOC_NEXT_SIBLING;
 
 	/* LINTED */
 	while (mdoc->last != to) {
+		/*
+		 * Save the parent here, because we may delete the
+		 * m->last node in the post-validation phase and reset
+		 * it to m->last->parent, causing a step in the closing
+		 * out to be lost.
+		 */
+		np = mdoc->last->parent;
 		if ( ! mdoc_valid_post(mdoc))
 			return(0);
-		mdoc->last = mdoc->last->parent;
+		n = mdoc->last;
+		mdoc->last = np;
 		assert(mdoc->last);
+		mdoc->last->last = n;
 	}
 
 	return(mdoc_valid_post(mdoc));