===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- src/usr.bin/mandoc/man.c	2018/12/31 10:03:38	1.134
+++ src/usr.bin/mandoc/man.c	2019/01/05 00:36:46	1.135
@@ -1,7 +1,7 @@
-/*	$OpenBSD: man.c,v 1.134 2018/12/31 10:03:38 schwarze Exp $ */
+/*	$OpenBSD: man.c,v 1.135 2019/01/05 00:36:46 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -90,9 +90,9 @@
 	}
 	if ( ! (man->flags & MAN_BLINE))
 		return;
-	man->flags &= ~MAN_BLINE;
 	man_unscope(man, man->last->parent);
 	roff_body_alloc(man, line, offs, man->last->tok);
+	man->flags &= ~(MAN_BLINE | ROFF_NONOFILL);
 }
 
 static int
@@ -266,9 +266,9 @@
 	    man_macro(tok)->flags & MAN_NSCOPED)
 		return 1;
 
-	man->flags &= ~MAN_BLINE;
 	man_unscope(man, man->last->parent);
 	roff_body_alloc(man, ln, ppos, man->last->tok);
+	man->flags &= ~(MAN_BLINE | ROFF_NONOFILL);
 	return 1;
 }
 
@@ -311,7 +311,7 @@
 		n = man->last;
 		man_unscope(man, n);
 		roff_body_alloc(man, n->line, n->pos, n->tok);
-		man->flags &= ~MAN_BLINE;
+		man->flags &= ~(MAN_BLINE | ROFF_NONOFILL);
 	}
 
 	/*
@@ -338,6 +338,6 @@
 		    "%s breaks %s", roff_name[tok], roff_name[n->tok]);
 
 		roff_node_delete(man, n);
-		man->flags &= ~MAN_BLINE;
+		man->flags &= ~(MAN_BLINE | ROFF_NONOFILL);
 	}
 }