diff options
| author | Peter Stephenson <pws@zsh.org> | 2015-09-01 11:45:23 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2015-09-01 11:45:23 +0100 |
| commit | 21382e0b20c697e83d0bc903a5e17b75e5979995 (patch) | |
| tree | 755fae7743f0c726b6190d059e8927880f92d198 | |
| parent | b73e4442e850a565525b7ed75f2a7b01698499d6 (diff) | |
| download | zsh-21382e0b20c697e83d0bc903a5e17b75e5979995.tar.gz zsh-21382e0b20c697e83d0bc903a5e17b75e5979995.tar.xz zsh-21382e0b20c697e83d0bc903a5e17b75e5979995.zip | |
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.
| -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 * |