===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.138
retrieving revision 1.141
diff -u -p -r1.138 -r1.141
--- mandoc/mdoc_macro.c	2014/07/30 17:06:26	1.138
+++ mandoc/mdoc_macro.c	2014/08/16 19:50:37	1.141
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.138 2014/07/30 17:06:26 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.141 2014/08/16 19:50:37 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,10 +15,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -1041,7 +1041,8 @@ blk_full(MACRO_PROT_ARGS)
 
 	if (tok == MDOC_It) {
 		for (n = mdoc->last; n; n = n->parent)
-			if (n->tok == MDOC_Bl)
+			if (n->tok == MDOC_Bl &&
+			    ! (n->flags & MDOC_VALID))
 				break;
 		if (n == NULL) {
 			mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,
@@ -1785,7 +1786,7 @@ phrase_ta(MACRO_PROT_ARGS)
 		n = n->parent;
 	if (NULL == n || LIST_column != n->norm->Bl.type) {
 		mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse,
-		    line, ppos, NULL);
+		    line, ppos, "Ta");
 		return(1);
 	}