===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.147
retrieving revision 1.149
diff -u -p -r1.147 -r1.149
--- mandoc/html.c	2011/05/24 21:40:14	1.147
+++ mandoc/html.c	2011/07/07 14:34:11	1.149
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.147 2011/05/24 21:40:14 kristaps Exp $ */
+/*	$Id: html.c,v 1.149 2011/07/07 14:34:11 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -513,9 +513,11 @@ print_text(struct html *h, const char *word)
 			print_otag(h, TAG_I, 0, NULL);
 
 	assert(word);
-	if ( ! print_encode(h, word, 0))
+	if ( ! print_encode(h, word, 0)) {
 		if ( ! (h->flags & HTML_NONOSPACE))
 			h->flags &= ~HTML_NOSPACE;
+	} else
+		h->flags |= HTML_NOSPACE;
 
 	if (h->metaf) {
 		print_tagq(h, h->metaf);
@@ -595,7 +597,6 @@ bufcat(struct html *h, const char *p)
 
 	h->buflen = strlcat(h->buf, p, BUFSIZ);
 	assert(h->buflen < BUFSIZ);
-	h->buflen--;
 }
 
 void