===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.140
retrieving revision 1.142
diff -u -p -r1.140 -r1.142
--- mandoc/man_macro.c	2018/12/31 07:08:12	1.140
+++ mandoc/man_macro.c	2018/12/31 10:04:39	1.142
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.140 2018/12/31 07:08:12 schwarze Exp $ */
+/*	$Id: man_macro.c,v 1.142 2018/12/31 10:04:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -381,6 +381,11 @@ in_line_eoln(MACRO_PROT_ARGS)
 	roff_elem_alloc(man, line, ppos, tok);
 	n = man->last;
 
+	if (tok == MAN_EX)
+		man->flags |= ROFF_NOFILL;
+	else if (tok == MAN_EE)
+		man->flags &= ~ROFF_NOFILL;
+
 	for (;;) {
 		if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) {
 			mandoc_msg(MANDOCERR_ARG_EXCESS, line, *pos,
@@ -424,7 +429,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;
 	}