diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/zle_tricky.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 832f77784..94b987f62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 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> diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index 97bdcc020..b1a6f9e7e 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -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 * |