Commit 21382e0b authored by Peter Stephenson's avatar Peter Stephenson

36365: magic-space could delete the reset of the line.

If we got a LEXERR, which didn't necessarily mean an actual error,
just something the rather nasty ctxtlex() got confused by, we
didn't scan the reset of the line.
parent b73e4442
2015-09-01 Peter Stephenson <p.stephenson@samsung.com>
* unposted: Config/versino.mk: update version to 5.1-dev-0 to
* 36365: Src/Zle/zle_tricky.c: magic-space removed the reset of
the line if the lexer found something complicated.
* unposted: Config/version.mk: update version to 5.1-dev-0 to
avoid clash with 5.1 release.
2015-09-01 Daniel Shahaf <d.s@daniel.shahaf.name>
......
......@@ -2812,6 +2812,8 @@ doexpandhist(void)
do {
ctxtlex();
} while (tok != ENDINPUT && tok != LEXERR);
if (tok == LEXERR)
lexstop = 0;
while (!lexstop)
hgetc();
/* We have to save errflags because it's reset in zcontext_restore. Since *
......
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