===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.193
retrieving revision 1.195
diff -u -p -r1.193 -r1.195
--- mandoc/mdoc_macro.c	2015/04/19 14:57:38	1.193
+++ mandoc/mdoc_macro.c	2015/04/23 15:35:59	1.195
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.193 2015/04/19 14:57:38 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.195 2015/04/23 15:35:59 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -210,7 +210,7 @@ const	struct mdoc_macro * const mdoc_macros = __mdoc_m
  * are errors.
  */
 void
-mdoc_macroend(struct roff_man *mdoc)
+mdoc_endparse(struct roff_man *mdoc)
 {
 	struct roff_node *n;
 
@@ -291,18 +291,21 @@ rew_pending(struct roff_man *mdoc, const struct roff_n
 	for (;;) {
 		rew_last(mdoc, n);
 
-		switch (n->type) {
-		case ROFFT_HEAD:
-			roff_body_alloc(mdoc, n->line, n->pos, n->tok);
-			return;
-		case ROFFT_BLOCK:
-			break;
-		default:
-			return;
-		}
-
-		if ( ! (n->flags & MDOC_BROKEN))
-			return;
+		if (mdoc->last == n) {
+			switch (n->type) {
+			case ROFFT_HEAD:
+				roff_body_alloc(mdoc, n->line, n->pos,
+				    n->tok);
+				return;
+			case ROFFT_BLOCK:
+				break;
+			default:
+				return;
+			}
+			if ( ! (n->flags & MDOC_BROKEN))
+				return;
+		} else
+			n = mdoc->last;
 
 		for (;;) {
 			if ((n = n->parent) == NULL)