From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Tue, 8 Nov 2005 02:24:17 +0000 (+0000)
Subject: correction: in mbwidth(), use the width of Unicode U+FFFD (Replacement
X-Git-Tag: v1.3.10~143
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f1a717291bea6353dd5c2e22cd75974adc3510bb;p=nano.git

correction: in mbwidth(), use the width of Unicode U+FFFD (Replacement
Character) instead of hardcoding a width of one for unprintable
characters


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3103 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index 563ba332..8138155c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,9 +76,9 @@ CVS code -
 - chars.c:
   mbwidth()
 	- If wcwidth() returns -1 for the character passed in, treat the
-	  character as being one column wide instead of zero columns
-	  wide, since there are display problems that crop up with the
-	  latter approach. (DLR)
+	  character as having the width of Unicode U+FFFD (Replacement
+	  Character) instead of having zero width, since there are
+	  display problems that crop up with the latter approach. (DLR)
 - files.c:
   read_file()
 	- Remove apparently unneeded logic to handle a case where
diff --git a/src/chars.c b/src/chars.c
index c48e3484..531ffad0 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -300,7 +300,7 @@ int mbwidth(const char *c)
 	width = wcwidth(wc);
 
 	if (width == -1)
-	    width = 1;
+	    width = wcwidth(bad_wchar);
 
 	return width;
     } else