===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -c -r1.114 -r1.115
*** src/usr.bin/mandoc/mdoc_macro.c	2014/12/18 03:09:42	1.114
--- src/usr.bin/mandoc/mdoc_macro.c	2014/12/18 20:58:00	1.115
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_macro.c,v 1.114 2014/12/18 03:09:42 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_macro.c,v 1.115 2014/12/18 20:58:00 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 1557,1563 ****
  	/* Make sure we are in a column list or ignore this macro. */
  
  	n = mdoc->last;
! 	while (n != NULL && n->tok != MDOC_Bl)
  		n = n->parent;
  	if (n == NULL || n->norm->Bl.type != LIST_column) {
  		mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse,
--- 1557,1564 ----
  	/* Make sure we are in a column list or ignore this macro. */
  
  	n = mdoc->last;
! 	while (n != NULL &&
! 	    (n->tok != MDOC_Bl || n->flags & (MDOC_VALID | MDOC_BREAK)))
  		n = n->parent;
  	if (n == NULL || n->norm->Bl.type != LIST_column) {
  		mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse,