===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tbl_data.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/mandoc/tbl_data.c	2020/01/11 20:48:13	1.40
--- src/usr.bin/mandoc/tbl_data.c	2021/05/15 17:16:38	1.41
***************
*** 1,4 ****
! /*	$OpenBSD: tbl_data.c,v 1.40 2020/01/11 20:48:13 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011,2015,2017,2018,2019 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: tbl_data.c,v 1.41 2021/05/15 17:16:38 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011,2015,2017,2018,2019 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 242,251 ****
  	struct tbl_cell	*cp;
  	struct tbl_span	*sp;
  
! 	rp = (sp = tbl->last_span) == NULL ? tbl->first_row :
! 	    sp->pos == TBL_SPAN_DATA && sp->layout->next != NULL ?
! 	    sp->layout->next : sp->layout;
! 
  	assert(rp != NULL);
  
  	if (p[1] == '\0') {
--- 242,252 ----
  	struct tbl_cell	*cp;
  	struct tbl_span	*sp;
  
! 	for (sp = tbl->last_span; sp != NULL; sp = sp->prev)
! 		if (sp->pos == TBL_SPAN_DATA)
! 			break;
! 	rp = sp == NULL ? tbl->first_row :
! 	    sp->layout->next == NULL ? sp->layout : sp->layout->next;
  	assert(rp != NULL);
  
  	if (p[1] == '\0') {