summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/zle_move.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f14780fea..56389c328 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-21 Peter Stephenson <pws@csr.com>
+
+ * unposted: Src/Zle/zle_move.c: missing assignment in new
+ backwardmetafiedchar().
+
2008-04-20 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 24853: Src/utils.c, Src/zsh.h, Src/Zle/complist.c,
diff --git a/Src/Zle/zle_move.c b/Src/Zle/zle_move.c
index 5e4ebed5b..2db703051 100644
--- a/Src/Zle/zle_move.c
+++ b/Src/Zle/zle_move.c
@@ -174,7 +174,7 @@ backwardmetafiedchar(char *start, char *endptr, convchar_t *retchr)
#ifdef MULTIBYTE_SUPPORT
int charlen = 0;
char *last = NULL, *bufptr, *ptr = endptr;
- convchar_t lastc;
+ convchar_t lastc = (convchar_t)0; /* not used, silence compiler */
mbstate_t mbs;
size_t ret;
wchar_t wc;
@@ -247,11 +247,12 @@ backwardmetafiedchar(char *start, char *endptr, convchar_t *retchr)
/* This is the first character, so just return it. */
if (retchr)
*retchr = wc;
- return ptr;
+ return ptr;
}
if (!last) {
/* still looking for the character immediately before ptr */
last = ptr;
+ lastc = wc;
}
/* searching for base character of combining character */
charlen = 0;