===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -p -r1.368 -r1.369
--- mandoc/mdoc_validate.c	2018/12/31 07:46:07	1.368
+++ mandoc/mdoc_validate.c	2018/12/31 08:38:21	1.369
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.368 2018/12/31 07:46:07 schwarze Exp $ */
+/*	$Id: mdoc_validate.c,v 1.369 2018/12/31 08:38:21 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -336,9 +336,7 @@ mdoc_validate(struct roff_man *mdoc)
 		if (n->sec != SEC_SYNOPSIS ||
 		    (np->tok != MDOC_Cd && np->tok != MDOC_Fd))
 			check_text(mdoc, n->line, n->pos, n->string);
-		if (np->tok != MDOC_Ql && np->tok != MDOC_Dl &&
-		    (np->tok != MDOC_Bd ||
-		     (mdoc->flags & ROFF_NOFILL) == 0) &&
+		if ((n->flags & NODE_NOFILL) == 0 &&
 		    (np->tok != MDOC_It || np->type != ROFFT_HEAD ||
 		     np->parent->parent->norm->Bl.type != LIST_diag))
 			check_text_em(mdoc, n->line, n->pos, n->string);
@@ -411,7 +409,7 @@ check_text(struct roff_man *mdoc, int ln, int pos, cha
 {
 	char		*cp;
 
-	if (mdoc->flags & ROFF_NOFILL)
+	if (mdoc->last->flags & NODE_NOFILL)
 		return;
 
 	for (cp = p; NULL != (p = strchr(p, '\t')); p++)