===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.127
retrieving revision 1.129
diff -u -p -r1.127 -r1.129
--- mandoc/mdoc_term.c	2010/05/22 20:41:48	1.127
+++ mandoc/mdoc_term.c	2010/05/24 21:34:16	1.129
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.127 2010/05/22 20:41:48 joerg Exp $ */
+/*	$Id: mdoc_term.c,v 1.129 2010/05/24 21:34:16 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -274,6 +274,7 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
 
 	p->overstep = 0;
 	p->maxrmargin = p->defrmargin;
+	p->tabwidth = 5;
 
 	if (NULL == p->symtab)
 		switch (p->enc) {
@@ -613,7 +614,7 @@ print_bvspace(struct termp *p, 
 
 	/* A `-column' does not assert vspace within the list. */
 
-	if (MDOC_Bl == bl->tok && LIST_diag == bl->data.list)
+	if (MDOC_Bl == bl->tok && LIST_column == bl->data.list)
 		if (n->prev && MDOC_It == n->prev->tok)
 			return;
 
@@ -1593,6 +1594,7 @@ termp_fa_pre(DECL_ARGS)
 static int
 termp_bd_pre(DECL_ARGS)
 {
+	size_t			 tabwidth;
 	int	         	 i, type;
 	size_t			 rm, rmax;
 	const struct mdoc_node	*nn;
@@ -1622,6 +1624,8 @@ termp_bd_pre(DECL_ARGS)
 	if (MDOC_Literal != type && MDOC_Unfilled != type)
 		return(1);
 
+	tabwidth = p->tabwidth;
+	p->tabwidth = 8;
 	rm = p->rmargin;
 	rmax = p->maxrmargin;
 	p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
@@ -1636,6 +1640,7 @@ termp_bd_pre(DECL_ARGS)
 		else if (NULL == nn->prev)
 			term_flushln(p);
 	}
+	p->tabwidth = tabwidth;
 
 	p->rmargin = rm;
 	p->maxrmargin = rmax;