Even for UTF-8 output, a non-breaking space character has the same width

as a normal space character, and not width 0.  Bug reported by bentley@.

diff --git a/term_ascii.c b/term_ascii.c
index a2ab4839c1be983e12d6d645fc327dc64f879ac9..adcbe590b17a2813eb4b920d6aadbb397844b08e 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,4 +1,4 @@
-/*     $Id: term_ascii.c,v 1.25 2014/04/20 16:46:05 schwarze Exp $ */
+/*     $Id: term_ascii.c,v 1.26 2014/07/27 21:52:16 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -269,7 +269,12 @@ locale_width(const struct termp *p, int c)
 {
        int             rc;
 
-       return((rc = wcwidth(c)) < 0 ? 0 : rc);
+       if (c == ASCII_NBRSP)
+               c = ' ';
+       rc = wcwidth(c);
+       if (rc < 0)
+               rc = 0;
+       return(rc);
 }
 
 static void