===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_validate.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -c -r1.181 -r1.182
*** src/usr.bin/mandoc/mdoc_validate.c	2014/12/18 20:15:31	1.181
--- src/usr.bin/mandoc/mdoc_validate.c	2015/02/03 00:48:27	1.182
***************
*** 1,7 ****
! /*	$OpenBSD: mdoc_validate.c,v 1.181 2014/12/18 20:15:31 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
--- 1,7 ----
! /*	$OpenBSD: mdoc_validate.c,v 1.182 2015/02/03 00:48:27 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
!  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
***************
*** 1038,1052 ****
  static void
  post_nm(POST_ARGS)
  {
  
  	if (NULL != mdoc->meta.name)
  		return;
  
! 	mdoc_deroff(&mdoc->meta.name, mdoc->last);
  
  	if (NULL == mdoc->meta.name)
  		mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,
! 		    mdoc->last->line, mdoc->last->pos, "Nm");
  }
  
  static void
--- 1038,1060 ----
  static void
  post_nm(POST_ARGS)
  {
+ 	struct mdoc_node	*n;
  
+ 	n = mdoc->last;
+ 
+ 	if (n->last != NULL &&
+ 	    (n->last->tok == MDOC_Pp ||
+ 	     n->last->tok == MDOC_Lp))
+ 		mdoc_node_relink(mdoc, n->last);
+ 
  	if (NULL != mdoc->meta.name)
  		return;
  
! 	mdoc_deroff(&mdoc->meta.name, n);
  
  	if (NULL == mdoc->meta.name)
  		mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,
! 		    n->line, n->pos, "Nm");
  }
  
  static void