about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2005-09-09 13:48:59 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2005-09-09 13:48:59 +0000
commit5831792752f6f58ae6be8187832d4748287f6f11 (patch)
treec28e94af64086af5be79952eb018793d81e09a46
parentd39b9fabdb7c6802aff547b17810b02d9dffa8a4 (diff)
downloadzsh-5831792752f6f58ae6be8187832d4748287f6f11.tar.gz
zsh-5831792752f6f58ae6be8187832d4748287f6f11.tar.xz
zsh-5831792752f6f58ae6be8187832d4748287f6f11.zip
21717: Src/Zle/zle_misc.c: fix execute-named-command and -where-is
with multibyte support
-rw-r--r--ChangeLog4
-rw-r--r--Src/Zle/zle_misc.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 21469f438..6df6afe04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-09-09  Peter Stephenson  <pws@csr.com>
 
+	* 21717: Src/Zle/zle_misc.c: where-is and execute-named-command
+	didn't work with multibyte support because the remainder of
+	the character wasn't read properly.
+
 	* 21709 plus tweaks: Doc/Zsh/zle.yo, Src/builtin.c, Src/init.c,
 	Src/Zle/zle_keymap.c, Src/Zle/zle_main.c, Src/Zle/zle_misc.c,
 	Src/Zle/zle_vi.c: Use $KEYTIMOUT for bytes after the first
diff --git a/Src/Zle/zle_misc.c b/Src/Zle/zle_misc.c
index 05a780b0c..7159113a6 100644
--- a/Src/Zle/zle_misc.c
+++ b/Src/Zle/zle_misc.c
@@ -955,7 +955,7 @@ executenamedcommand(char *prmt)
 		else {
 #ifdef ZLE_UNICODE_SUPPORT
 		    if (!lastchar_wide_valid)
-			getrestchar(0);
+			getrestchar(lastchar);
 		    if (iswcntrl(lastchar_wide))
 #else
 		    if (icntrl(lastchar))