about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2015-09-26 13:46:20 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2015-09-26 13:46:20 -0700
commit50721a1986a3637e923ccc4531135b8aa39c8e70 (patch)
tree9002704b4e0424c3d03250847f49cc182613486e
parent92584634d3d39e9ca64475ae5af8010e2ccebe24 (diff)
downloadzsh-50721a1986a3637e923ccc4531135b8aa39c8e70.tar.gz
zsh-50721a1986a3637e923ccc4531135b8aa39c8e70.tar.xz
zsh-50721a1986a3637e923ccc4531135b8aa39c8e70.zip
36641: fix multibyte handling in incremental search during menu selection
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/complist.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f700ec067..964e340f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-26  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 36641: Src/Modules/complist.c: fix multibyte handling in
+	incremental search during menu selection
+
 2015-09-26  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* unposted (see 36633): Completion/Unix/Command/_hg: _hg:
diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index 01bcb7cf8..433701514 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -3300,7 +3300,7 @@ domenuselect(Hookdef dummy, Chdata dat)
 			    int len;
 
 			    memset(&mbs, 0, sizeof(mbs));
-			    len = wcrtomb(s, lastchar_wide, &mbs);
+			    len = wcrtomb(toins, lastchar_wide, &mbs);
 			    if (len < 0)
 				len = 0;
 			    insert[len] = '\0';