Commit 32f5d3d8 authored by Peter Stephenson's avatar Peter Stephenson

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

Also logical but possibly invisible fix for error propagated
back from listing interface.
parent 1ba2fac0
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>
* 36403: Src/hashtable.c Test/A02alias.ztst: type -w +=
......
......@@ -1761,7 +1761,8 @@ singlelineout:
inlist = 1;
listmatches();
inlist = 0;
zrefresh();
if (!errflag)
zrefresh();
}
if (showinglist == -1)
showinglist = nlnct;
......
......@@ -1183,6 +1183,11 @@ getzlequery(void)
/* get a character from the tty and interpret it */
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'))
c = ZWC('y');
else if (ZC_icntrl(c) || c == ZLEEOF)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment