===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -p -r1.359 -r1.360
--- mandoc/roff.c	2018/12/31 08:18:12	1.359
+++ mandoc/roff.c	2019/01/05 00:36:50	1.360
@@ -1,7 +1,7 @@
-/*	$Id: roff.c,v 1.359 2018/12/31 08:18:12 schwarze Exp $ */
+/*	$Id: roff.c,v 1.360 2019/01/05 00:36:50 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -889,7 +889,7 @@ roff_node_alloc(struct roff_man *man, int line, int po
 		n->flags |= NODE_SYNPRETTY;
 	else
 		n->flags &= ~NODE_SYNPRETTY;
-	if (man->flags & ROFF_NOFILL)
+	if ((man->flags & (ROFF_NOFILL | ROFF_NONOFILL)) == ROFF_NOFILL)
 		n->flags |= NODE_NOFILL;
 	else
 		n->flags &= ~NODE_NOFILL;