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

36416: ^C in getzlequery() just aborts query.

Browse source 
Also logical but possibly invisible fix for error propagated
back from listing interface.
This commit is contained in:
Peter Stephenson 2015-09-03 17:52:40 +01:00
parent 1ba2fac03d
commit 32f5d3d8c1
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2015-09-03 Peter Stephenson <p.stephenson@samsung.com>
* 36416: Src/Zle/zle_refresh.c, Src/Zle/zle_utils.c: If
keyboard interrupt during getzlequery(), don't propagate further,
just redraw the line. Also handle logical error that we
attempted to redware the line partially if an error or interrupt
was propagated.
2015-09-03 Daniel Shahaf <d.s@daniel.shahaf.name> 2015-09-03 Daniel Shahaf <d.s@daniel.shahaf.name>
* 36403: Src/hashtable.c Test/A02alias.ztst: type -w += * 36403: Src/hashtable.c Test/A02alias.ztst: type -w +=

3
Src/Zle/zle_refresh.c
View file

@ -1761,7 +1761,8 @@ singlelineout:
inlist = 1; inlist = 1;
listmatches(); listmatches();
inlist = 0; inlist = 0;
zrefresh(); if (!errflag)
zrefresh();
} }
if (showinglist == -1) if (showinglist == -1)
showinglist = nlnct; showinglist = nlnct;

5
Src/Zle/zle_utils.c
View file

@ -1183,6 +1183,11 @@ getzlequery(void)
/* get a character from the tty and interpret it */ /* get a character from the tty and interpret it */
c = getfullchar(0); c = getfullchar(0);
/*
* We'll interpret an interruption here as only interrupting the
* query, not the line editor.
*/
errflag &= ~ERRFLAG_INT;
if (c == ZWC('\t')) if (c == ZWC('\t'))
c = ZWC('y'); c = ZWC('y');
else if (ZC_icntrl(c) || c == ZLEEOF) else if (ZC_icntrl(c) || c == ZLEEOF)