3 files changed, 17 insertions, 4 deletions

diff --git a/chars.c b/chars.c
index a7582d78..c297e610 100644
--- a/chars.c
+++ b/chars.c
@@ -47,9 +47,10 @@ struct	ln {
 #define BOTH(w, x, y, z, a, b) \
 	{ NULL, (w), (y), (a), (x), (z), (b), CHARS_BOTH },
 
-static	struct ln lines[LINES_MAX] = {
+#define	CHAR_TBL_START	  static struct ln lines[LINES_MAX] = {
+#define	CHAR_TBL_END	  };
+
 #include "chars.in"
-};
 
 struct	tbl {
 	enum chars	  type;
diff --git a/chars.in b/chars.in
index 282cb598..9162b090 100644
--- a/chars.in
+++ b/chars.in
@@ -30,11 +30,16 @@
  * XXX - update LINES_MAX if adding more!
  */
 
+/* Non-breaking, non-collapsing space uses unit separator. */
+static const char ascii_nbrsp[2] = { 31, 0 };
+
+CHAR_TBL_START
+
 /* Spacing. */
 CHAR("c",			1,	"",		0,	"",		0)
 CHAR("0",			1,	" ",		1,	" ",	7)
 CHAR(" ",			1,	" ",		1,	" ",	7)
-CHAR("~",			1,	" ",		1,	" ",	6)
+CHAR("~",			1,	ascii_nbrsp,	1,	" ",	6)
 CHAR("%",			1,	"",		0,	"",		0)
 CHAR("&",			1,	"",		0,	"",		0)
 CHAR("^",			1,	"",		0,	"",		0)
@@ -416,3 +421,5 @@ CHAR("%0",			2,	"%o",		2,	"‰",	7)
 CHAR("fm",			2,	"\'",		1,	"′",	7)
 CHAR("sd",			2,	"\"",		1,	"″",	7)
 CHAR("mc",			2,	"mu",		2,	"µ",	6)
+
+CHAR_TBL_END
diff --git a/term.c b/term.c
index 5bd26040..de3f2326 100644
--- a/term.c
+++ b/term.c
@@ -229,7 +229,12 @@ term_flushln(struct termp *p)
 		for ( ; i < (int)p->col; i++) {
 			if (' ' == p->buf[i])
 				break;
-			putchar(p->buf[i]);
+
+			/* The unit sep. is a non-breaking space. */
+			if (31 == p->buf[i])
+				putchar(' ');
+			else
+				putchar(p->buf[i]);
 		}
 		vis += vsz;
 	}