===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -c -r1.114 -r1.115
*** src/usr.bin/mandoc/man.c	2015/10/22 21:53:49	1.114
--- src/usr.bin/mandoc/man.c	2017/01/10 13:46:53	1.115
***************
*** 1,4 ****
! /*	$OpenBSD: man.c,v 1.114 2015/10/22 21:53:49 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: man.c,v 1.115 2017/01/10 13:46:53 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 147,153 ****
  
  	assert(i);
  	if (mandoc_eos(buf, (size_t)i))
! 		man->last->flags |= MAN_EOS;
  
  	man_descope(man, line, offs);
  	return 1;
--- 147,153 ----
  
  	assert(i);
  	if (mandoc_eos(buf, (size_t)i))
! 		man->last->flags |= NODE_EOS;
  
  	man_descope(man, line, offs);
  	return 1;
***************
*** 338,344 ****
  	switch(n->tok) {
  	case MAN_nf:
  	case MAN_EX:
! 		if (man->flags & MAN_LITERAL && ! (n->flags & MAN_VALID))
  			mandoc_msg(MANDOCERR_NF_SKIP, man->parse,
  			    n->line, n->pos, "nf");
  		man->flags |= MAN_LITERAL;
--- 338,344 ----
  	switch(n->tok) {
  	case MAN_nf:
  	case MAN_EX:
! 		if (man->flags & MAN_LITERAL && ! (n->flags & NODE_VALID))
  			mandoc_msg(MANDOCERR_NF_SKIP, man->parse,
  			    n->line, n->pos, "nf");
  		man->flags |= MAN_LITERAL;
***************
*** 346,352 ****
  	case MAN_fi:
  	case MAN_EE:
  		if ( ! (man->flags & MAN_LITERAL) &&
! 		     ! (n->flags & MAN_VALID))
  			mandoc_msg(MANDOCERR_FI_SKIP, man->parse,
  			    n->line, n->pos, "fi");
  		man->flags &= ~MAN_LITERAL;
--- 346,352 ----
  	case MAN_fi:
  	case MAN_EE:
  		if ( ! (man->flags & MAN_LITERAL) &&
! 		     ! (n->flags & NODE_VALID))
  			mandoc_msg(MANDOCERR_FI_SKIP, man->parse,
  			    n->line, n->pos, "fi");
  		man->flags &= ~MAN_LITERAL;
***************
*** 354,360 ****
  	default:
  		break;
  	}
! 	man->last->flags |= MAN_VALID;
  }
  
  void
--- 354,360 ----
  	default:
  		break;
  	}
! 	man->last->flags |= NODE_VALID;
  }
  
  void