mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-27 02:01:09 +01:00
Code Releases Activity

20300: fix spurious EOF from ^C

Browse source
This commit is contained in:
Peter Stephenson 2004-09-02 09:20:35 +00:00
parent 7f2db6916e
commit d24593bf38
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-09-02 Peter Stephenson <pws@csr.com>
* 20300: Src/Zle/zle_main.c: typing ^D to list completions,
then two ^C's caused a spurious EOF.
2004-08-24 Wayne Davison <wayned@users.sourceforge.net> 2004-08-24 Wayne Davison <wayned@users.sourceforge.net>
* 20283: Completion/Unix/Command/_ant: Improved the parsing * 20283: Completion/Unix/Command/_ant: Improved the parsing

17
Src/Zle/zle_main.c
View file

@ -687,12 +687,19 @@ zlecore(void)
reselectkeymap(); reselectkeymap();
selectlocalmap(NULL); selectlocalmap(NULL);
bindk = getkeycmd(); bindk = getkeycmd();
if (!ll && isfirstln && !(zlereadflags & ZLRF_IGNOREEOF) &&
lastchar == eofchar) {
eofsent = 1;
break;
}
if (bindk) { if (bindk) {
if (!ll && isfirstln && !(zlereadflags & ZLRF_IGNOREEOF) &&
lastchar == eofchar) {
/*
* Slight hack: this relies on getkeycmd returning
* a value for the EOF character. However,
* undefined-key is fine. That's necessary because
* otherwise we can't distinguish this case from
* a ^C.
*/
eofsent = 1;
break;
}
if (execzlefunc(bindk, zlenoargs)) if (execzlefunc(bindk, zlenoargs))
handlefeep(zlenoargs); handlefeep(zlenoargs);
handleprefixes(); handleprefixes();