about summary refs log tree commit diff
path: root/Src/Zle/zle_misc.c
diff options
context:
space:
mode:
authorPeter Stephenson <p.w.stephenson@ntlworld.com>2015-09-11 21:40:45 +0100
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2015-09-11 21:40:45 +0100
commite1c0a947cc845c71dd844db44016d07922cfcefa (patch)
treef952b7ac97712807e1d2b696987a00afdaf7ddf8 /Src/Zle/zle_misc.c
parent560a23033d2d0e029bbbcda0366053d8d87a37d9 (diff)
downloadzsh-e1c0a947cc845c71dd844db44016d07922cfcefa.tar.gz
zsh-e1c0a947cc845c71dd844db44016d07922cfcefa.tar.xz
zsh-e1c0a947cc845c71dd844db44016d07922cfcefa.zip
Read full multibyte string early for self-insert
Diffstat (limited to 'Src/Zle/zle_misc.c')
-rw-r--r--Src/Zle/zle_misc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/Src/Zle/zle_misc.c b/Src/Zle/zle_misc.c
index 2d1862813..12143e05f 100644
--- a/Src/Zle/zle_misc.c
+++ b/Src/Zle/zle_misc.c
@@ -115,9 +115,7 @@ selfinsert(UNUSED(char **args))
     ZLE_CHAR_T tmp;
 
 #ifdef MULTIBYTE_SUPPORT
-    if (!lastchar_wide_valid)
-	if (getrestchar(lastchar) == WEOF)
-	    return 1;
+    DPUTS(!lastchar_wide_valid, "keybuf did not read full wide character");
 #endif
     tmp = LASTFULLCHAR;
     doinsert(&tmp, 1);
@@ -1431,7 +1429,7 @@ executenamedcommand(char *prmt)
 		else {
 #ifdef MULTIBYTE_SUPPORT
 		    if (!lastchar_wide_valid)
-			getrestchar(lastchar);
+			getrestchar(lastchar, NULL, NULL);
 		    if (lastchar_wide == WEOF)
 			feep = 1;
 		    else