===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.141
retrieving revision 1.144
diff -u -p -r1.141 -r1.144
--- mandoc/man_macro.c	2018/12/31 08:03:46	1.141
+++ mandoc/man_macro.c	2019/01/05 18:59:46	1.144
@@ -1,7 +1,7 @@
-/*	$Id: man_macro.c,v 1.141 2018/12/31 08:03:46 schwarze Exp $ */
+/*	$Id: man_macro.c,v 1.144 2019/01/05 18:59:46 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2012-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -297,8 +297,10 @@ blk_exp(MACRO_PROT_ARGS)
 	char		*p;
 	int		 la;
 
-	if (tok == MAN_RS)
+	if (tok == MAN_RS) {
 		rew_scope(man, tok);
+		man->flags |= ROFF_NONOFILL;
+	}
 	roff_block_alloc(man, line, ppos, tok);
 	head = roff_head_alloc(man, line, ppos, tok);
 
@@ -322,6 +324,7 @@ blk_exp(MACRO_PROT_ARGS)
 
 	man_unscope(man, head);
 	roff_body_alloc(man, line, ppos, tok);
+	man->flags &= ~ROFF_NONOFILL;
 }
 
 /*
@@ -338,6 +341,7 @@ blk_imp(MACRO_PROT_ARGS)
 	struct roff_node *n;
 
 	rew_scope(man, tok);
+	man->flags |= ROFF_NONOFILL;
 	if (tok == MAN_SH || tok == MAN_SS)
 		man->flags &= ~ROFF_NOFILL;
 	roff_block_alloc(man, line, ppos, tok);
@@ -369,6 +373,7 @@ blk_imp(MACRO_PROT_ARGS)
 
 	man_unscope(man, n);
 	roff_body_alloc(man, line, ppos, tok);
+	man->flags &= ~ROFF_NONOFILL;
 }
 
 void
@@ -429,7 +434,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 	/* Rewind our element scope. */
 
 	for ( ; man->last; man->last = man->last->parent) {
-		man_state(man, man->last);
+		man->last->flags |= NODE_VALID;
 		if (man->last == n)
 			break;
 	}