From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Tue, 8 Nov 2005 02:27:11 +0000 (+0000)
Subject: cosmetic fix
X-Git-Tag: v1.3.10~142
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c0181c95ee171efb5da2db5841071f4a6229a24f;p=nano.git

cosmetic fix


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

diff --git a/ChangeLog b/ChangeLog
index 8138155c..373fa3f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -78,7 +78,8 @@ CVS code -
 	- If wcwidth() returns -1 for the character passed in, treat the
 	  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)
+	  display problems that sometimes 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 531ffad0..ef704422 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -299,8 +299,10 @@ int mbwidth(const char *c)
 
 	width = wcwidth(wc);
 
-	if (width == -1)
-	    width = wcwidth(bad_wchar);
+	if (width == -1) {
+	    wc = bad_wchar;
+	    width = wcwidth(wc);
+	}
 
 	return width;
     } else