===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.144
retrieving revision 1.146
diff -u -p -r1.144 -r1.146
--- mandoc/mdoc.c	2010/05/31 20:14:10	1.144
+++ mandoc/mdoc.c	2010/06/12 11:58:22	1.146
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.144 2010/05/31 20:14:10 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.146 2010/06/12 11:58:22 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -568,7 +568,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 	 */
 
 	if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-			LIST_column == n->data.list) {
+			LIST_column == n->data.Bl.type) {
 		/* `Bl' is open without any children. */
 		m->flags |= MDOC_FREECOL;
 		return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
@@ -577,7 +577,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 	if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
 			NULL != n->parent &&
 			MDOC_Bl == n->parent->tok &&
-			LIST_column == n->parent->data.list) {
+			LIST_column == n->parent->data.Bl.type) {
 		/* `Bl' has block-level `It' children. */
 		m->flags |= MDOC_FREECOL;
 		return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
@@ -595,6 +595,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 		case '-':
 			if (mandoc_hyph(buf + offs, c))
 				*c = ASCII_HYPH;
+			ws = NULL;
 			break;
 		case ' ':
 			if (NULL == ws)
@@ -782,7 +783,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 	 */
 
 	if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-			LIST_column == n->data.list) {
+			LIST_column == n->data.Bl.type) {
 		m->flags |= MDOC_FREECOL;
 		if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
 			goto err;
@@ -798,7 +799,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 	if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
 			NULL != n->parent &&
 			MDOC_Bl == n->parent->tok &&
-			LIST_column == n->parent->data.list) {
+			LIST_column == n->parent->data.Bl.type) {
 		m->flags |= MDOC_FREECOL;
 		if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
 			goto err;