===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.145
retrieving revision 1.147
diff -u -p -r1.145 -r1.147
--- mandoc/mdoc_macro.c	2014/11/20 00:31:28	1.145
+++ mandoc/mdoc_macro.c	2014/11/26 19:22:51	1.147
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.145 2014/11/20 00:31:28 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.147 2014/11/26 19:22:51 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -171,7 +171,7 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |
 			MDOC_EXPLICIT | MDOC_JOIN }, /* So */
 	{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sq */
-	{ in_line_eoln, 0 }, /* Sm */
+	{ in_line_argn, 0 }, /* Sm */
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sx */
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sy */
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */
@@ -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);