===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- mandoc/man_macro.c	2014/07/07 19:18:15	1.83
+++ mandoc/man_macro.c	2014/07/07 21:36:20	1.84
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.83 2014/07/07 19:18:15 schwarze Exp $ */
+/*	$Id: man_macro.c,v 1.84 2014/07/07 21:36:20 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -110,7 +110,7 @@ man_unscope(struct man *man, const struct man_node *to
 		    MAN_BLOCK == n->type &&
 		    0 == (MAN_VALID & n->flags) &&
 		    MAN_EXPLICIT & man_macros[n->tok].flags)
-			mandoc_msg(MANDOCERR_SCOPEEXIT,
+			mandoc_msg(MANDOCERR_BLK_NOEND,
 			    man->parse, n->line, n->pos,
 			    man_macronames[n->tok]);
 		/*
@@ -270,7 +270,8 @@ blk_close(MACRO_PROT_ARGS)
 			break;
 
 	if (NULL == nn) {
-		man_pmsg(man, line, ppos, MANDOCERR_NOSCOPE);
+		mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse,
+		    line, ppos, man_macronames[tok]);
 		if ( ! rew_scope(MAN_BLOCK, man, MAN_PP))
 			return(0);
 	} else