===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.185
retrieving revision 1.187
diff -u -p -r1.185 -r1.187
--- mandoc/man.c	2018/12/31 08:38:21	1.185
+++ mandoc/man.c	2019/01/05 00:36:50	1.187
@@ -1,7 +1,7 @@
-/*	$Id: man.c,v 1.185 2018/12/31 08:38:21 schwarze Exp $ */
+/*	$Id: man.c,v 1.187 2019/01/05 00:36:50 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
@@ -92,9 +92,9 @@ man_descope(struct roff_man *man, int line, int offs, 
 	}
 	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
@@ -268,9 +268,9 @@ man_pmacro(struct roff_man *man, int ln, char *buf, in
 	    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;
 }
 
@@ -313,7 +313,7 @@ man_breakscope(struct roff_man *man, int tok)
 		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);
 	}
 
 	/*
@@ -340,25 +340,6 @@ man_breakscope(struct roff_man *man, int tok)
 		    "%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);
 	}
-}
-
-void
-man_state(struct roff_man *man, struct roff_node *n)
-{
-
-	switch(n->tok) {
-	case ROFF_nf:
-	case MAN_EX:
-		man->flags |= ROFF_NOFILL;
-		break;
-	case ROFF_fi:
-	case MAN_EE:
-		man->flags &= ~ROFF_NOFILL;
-		break;
-	default:
-		break;
-	}
-	man->last->flags |= NODE_VALID;
 }