===================================================================
RCS file: /cvs/mandoc/tbl_data.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- mandoc/tbl_data.c	2015/01/21 00:47:04	1.33
+++ mandoc/tbl_data.c	2015/01/27 05:21:45	1.34
@@ -1,7 +1,7 @@
-/*	$Id: tbl_data.c,v 1.33 2015/01/21 00:47:04 schwarze Exp $ */
+/*	$Id: tbl_data.c,v 1.34 2015/01/27 05:21:45 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -190,15 +190,15 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row
 	dp->opts = &tbl->opts;
 	dp->layout = rp;
 	dp->head = tbl->first_head;
+	dp->prev = tbl->last_span;
 
-	if (tbl->last_span) {
-		tbl->last_span->next = dp;
-		tbl->last_span = dp;
-	} else {
-		tbl->last_span = tbl->first_span = dp;
+	if (dp->prev == NULL) {
+		tbl->first_span = dp;
 		tbl->current_span = NULL;
 		dp->flags |= TBL_SPAN_FIRST;
-	}
+	} else
+		dp->prev->next = dp;
+	tbl->last_span = dp;
 
 	return(dp);
 }