summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2005-01-26 14:29:12 +0000
committerClint Adams <clint@users.sourceforge.net>2005-01-26 14:29:12 +0000
commit3934f7a40208adc9334b5f957be4c5b9dee29979 (patch)
treeee9d84bf22e11a8605023074f0fecdcbda0a8ac3
parent9453ea957ef660644f2c8fdd7055d70355c27d8a (diff)
downloadzsh-3934f7a40208adc9334b5f957be4c5b9dee29979.tar.gz
zsh-3934f7a40208adc9334b5f957be4c5b9dee29979.zip
* 20751: Src/Zle/zle_refresh.c: use '?' for character conversion error
-rw-r--r--ChangeLog4
-rw-r--r--Src/Zle/zle_refresh.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0950bcedd..a543f0737 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
2005-01-26 Clint Adams <clint@zsh.org>
- * 20747: Src/Zle/zle_refresh.c, Src/system.h: some wide char
- support in the zle refresh code.
+ * 20747, 20751: Src/Zle/zle_refresh.c, Src/system.h: some
+ wide char support in the zle refresh code.
2005-01-26 Peter Stephenson <pws@csr.com>
diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c
index 7c6de6276..f67c5aeb3 100644
--- a/Src/Zle/zle_refresh.c
+++ b/Src/Zle/zle_refresh.c
@@ -478,7 +478,7 @@ zrefresh(void)
nextline
}
#ifdef ZLE_UNICODE_SUPPORT
-# error What to do here
+ *s++ = ((*t == 127) || (*t > 255)) ? '?' : (*t | '@');
#else
*s++ = (*t == 127) ? '?' : (*t | '@');
#endif
@@ -488,7 +488,7 @@ zrefresh(void)
i = wcrtomb(s, *t, &shiftstate);
if (i == -1) {
- /* error; what to do? */
+ *s++ = '?';
} else {
s += i;
}