===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- mandoc/term.c	2015/04/29 18:35:00	1.248
+++ mandoc/term.c	2015/08/30 21:10:56	1.249
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.248 2015/04/29 18:35:00 schwarze Exp $ */
+/*	$Id: term.c,v 1.249 2015/08/30 21:10:56 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -499,6 +499,9 @@ term_word(struct termp *p, const char *word)
 						p->flags |= TERMP_BACKBEFORE;
 				}
 			}
+			/* Trim trailing backspace/blank pair. */
+			if (p->col > 2 && p->buf[p->col - 1] == ' ')
+				p->col -= 2;
 			continue;
 		default:
 			continue;
@@ -561,7 +564,10 @@ encode1(struct termp *p, int c)
 	    p->fontq[p->fonti] : TERMFONT_NONE;
 
 	if (p->flags & TERMP_BACKBEFORE) {
-		p->buf[p->col++] = 8;
+		if (p->buf[p->col - 1] == ' ')
+			p->col--;
+		else
+			p->buf[p->col++] = 8;
 		p->flags &= ~TERMP_BACKBEFORE;
 	}
 	if (TERMFONT_UNDER == f || TERMFONT_BI == f) {