===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.144
retrieving revision 1.146
diff -u -p -r1.144 -r1.146
--- mandoc/mdoc_macro.c	2014/11/17 06:44:58	1.144
+++ mandoc/mdoc_macro.c	2014/11/25 20:00:01	1.146
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.144 2014/11/17 06:44:58 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.146 2014/11/25 20:00:01 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -437,9 +437,11 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type,
 	 * Default block rewinding rules.
 	 * In particular, always skip block end markers,
 	 * and let all blocks rewind Nm children.
+	 * Do not warn again when closing a block,
+	 * since closing the body already warned.
 	 */
 	if (ENDBODY_NOT != p->end || MDOC_Nm == p->tok ||
-	    (MDOC_BLOCK == p->type &&
+	    MDOC_BLOCK == type || (MDOC_BLOCK == p->type &&
 	    ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)))
 		return(REWIND_MORE);
 
@@ -926,7 +928,8 @@ in_line(MACRO_PROT_ARGS)
 			break;
 		}
 
-		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
+		ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ?
+		    MDOC_MAX : lookup(tok, p);
 
 		/*
 		 * In this case, we've located a submacro and must
@@ -991,6 +994,8 @@ in_line(MACRO_PROT_ARGS)
 			if (scope && ! rew_elem(mdoc, tok))
 				return(0);
 			scope = 0;
+			if (tok == MDOC_Fn)
+				mayopen = 0;
 		} else if (mayopen && !scope) {
 			if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
 				return(0);