===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.83
retrieving revision 1.87
diff -u -p -r1.83 -r1.87
--- mandoc/man_macro.c	2014/07/07 19:18:15	1.83
+++ mandoc/man_macro.c	2014/07/30 23:01:39	1.87
@@ -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.87 2014/07/30 23:01:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -49,8 +49,6 @@ static	enum rew	 rew_dohalt(enum mant, enum man_type,
 				const struct man_node *);
 static	enum rew	 rew_block(enum mant, enum man_type,
 				const struct man_node *);
-static	void		 rew_warn(struct man *,
-				struct man_node *, enum mandocerr);
 
 const	struct man_macro __man_macros[MAN_MAX] = {
 	{ in_line_eoln, MAN_NSCOPED }, /* br */
@@ -106,13 +104,35 @@ man_unscope(struct man *man, const struct man_node *to
 	to = to->parent;
 	n = man->last;
 	while (n != to) {
-		if (NULL == to &&
-		    MAN_BLOCK == n->type &&
-		    0 == (MAN_VALID & n->flags) &&
-		    MAN_EXPLICIT & man_macros[n->tok].flags)
-			mandoc_msg(MANDOCERR_SCOPEEXIT,
-			    man->parse, n->line, n->pos,
-			    man_macronames[n->tok]);
+
+		/* Reached the end of the document? */
+
+		if (to == NULL && ! (n->flags & MAN_VALID)) {
+			if (man->flags & (MAN_BLINE | MAN_ELINE) &&
+			    man_macros[n->tok].flags & MAN_SCOPED) {
+				mandoc_vmsg(MANDOCERR_BLK_LINE,
+				    man->parse, n->line, n->pos,
+				    "EOF breaks %s",
+				    man_macronames[n->tok]);
+				if (man->flags & MAN_ELINE)
+					man->flags &= ~MAN_ELINE;
+				else {
+					assert(n->type == MAN_HEAD);
+					n = n->parent;
+					man->flags &= ~MAN_BLINE;
+				}
+				man->last = n;
+				n = n->parent;
+				man_node_delete(man, man->last);
+				continue;
+			}
+			if (n->type == MAN_BLOCK &&
+			    man_macros[n->tok].flags & MAN_EXPLICIT)
+				mandoc_msg(MANDOCERR_BLK_NOEND,
+				    man->parse, n->line, n->pos,
+				    man_macronames[n->tok]);
+		}
+
 		/*
 		 * We might delete the man->last node
 		 * in the post-validation phase.
@@ -270,7 +290,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
@@ -414,13 +435,6 @@ in_line_eoln(MACRO_PROT_ARGS)
 		assert( ! (MAN_NSCOPED & man_macros[tok].flags));
 		man->flags |= MAN_ELINE;
 		return(1);
-	}
-
-	/* Set ignorable context, if applicable. */
-
-	if (MAN_NSCOPED & man_macros[tok].flags) {
-		assert( ! (MAN_SCOPED & man_macros[tok].flags));
-		man->flags |= MAN_ILINE;
 	}
 
 	assert(MAN_ROOT != man->last->type);