===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.178
retrieving revision 1.180
diff -u -p -r1.178 -r1.180
--- mandoc/mdoc_macro.c	2015/02/06 03:38:45	1.178
+++ mandoc/mdoc_macro.c	2015/02/07 16:42:33	1.180
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.178 2015/02/06 03:38:45 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.180 2015/02/07 16:42:33 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -941,6 +941,7 @@ blk_full(MACRO_PROT_ARGS)
 					    mdoc_macronames[tok],
 					    mdoc_macronames[n->tok]);
 					rew_pending(mdoc, n);
+					n = mdoc->last;
 					continue;
 				case MDOC_It:
 					/* Delay in case it's astray. */
@@ -1403,9 +1404,10 @@ in_line_eoln(MACRO_PROT_ARGS)
 			rew_last(mdoc, mdoc->last->parent);
 	}
 
-	if (buf[*pos] == '\0' && tok == MDOC_Fd) {
+	if (buf[*pos] == '\0' &&
+	    (tok == MDOC_Fd || mdoc_macronames[tok][0] == '%')) {
 		mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
-		    line, ppos, "Fd");
+		    line, ppos, mdoc_macronames[tok]);
 		return;
 	}