===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.149
retrieving revision 1.151
diff -u -p -r1.149 -r1.151
--- mandoc/term.c	2010/06/25 18:53:14	1.149
+++ mandoc/term.c	2010/06/27 01:26:20	1.151
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.149 2010/06/25 18:53:14 kristaps Exp $ */
+/*	$Id: term.c,v 1.151 2010/06/27 01:26:20 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -31,8 +31,6 @@
 #include "chars.h"
 #include "out.h"
 #include "term.h"
-#include "man.h"
-#include "mdoc.h"
 #include "main.h"
 
 static	void		  spec(struct termp *, const char *, size_t);
@@ -482,9 +480,14 @@ term_word(struct termp *p, const char *word)
 		}
 
 	if ( ! (TERMP_NOSPACE & p->flags)) {
-		bufferc(p, ' ');
-		if (TERMP_SENTENCE & p->flags)
+		if ( ! (TERMP_KEEP & p->flags)) {
+			if (TERMP_PREKEEP & p->flags)
+				p->flags |= TERMP_KEEP;
 			bufferc(p, ' ');
+			if (TERMP_SENTENCE & p->flags)
+				bufferc(p, ' ');
+		} else
+			bufferc(p, ASCII_NBRSP);
 	}
 
 	if ( ! (p->flags & TERMP_NONOSPACE))