X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/c8851c4bc15085865d2e6cb7f1434c3ad94b196e..3c7b73a2f8774480e0df1984d751f9ead2c8c29d:/man_macro.c

diff --git a/man_macro.c b/man_macro.c
index bc39053f..867e3e70 100644
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.24 2009/08/20 13:51:55 kristaps Exp $ */
+/*	$Id: man_macro.c,v 1.26 2009/08/21 12:12:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -236,6 +236,7 @@ blk_imp(MACRO_PROT_ARGS)
 {
 	int		 w, la;
 	char		*p;
+	struct man_node	*n;
 
 	/* Close out prior scopes. */
 
@@ -251,6 +252,8 @@ blk_imp(MACRO_PROT_ARGS)
 	if ( ! man_head_alloc(m, line, ppos, tok))
 		return(0);
 
+	n = m->last;
+
 	/* Add line arguments. */
 
 	for (;;) {
@@ -268,7 +271,7 @@ blk_imp(MACRO_PROT_ARGS)
 
 	/* Close out head and open body (unless MAN_SCOPE). */
 
-	if (MAN_SCOPED & man_macros[tok].flags) {
+	if (n == m->last && MAN_SCOPED & man_macros[tok].flags) {
 		m->flags |= MAN_BLINE;
 		return(1);
 	} else if ( ! rew_scope(MAN_HEAD, m, tok))
@@ -303,7 +306,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 			return(0);
 	}
 
-	if (n == m->last && (MAN_SCOPED & man_macros[tok].flags)) {
+	if (n == m->last && MAN_SCOPED & man_macros[tok].flags) {
 		m->flags |= MAN_ELINE;
 		return(1);
 	} 
@@ -354,7 +357,8 @@ man_macroend(struct man *m)
 			continue;
 		if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
 			continue;
-		return(man_nerr(m, n, WEXITSCOPE));
+		if ( ! man_nwarn(m, n, WEXITSCOPE))
+			return(0);
 	}
 
 	return(man_unscope(m, m->first));