diff options
author | Barton E. Schaefer <schaefer@zsh.org> | 2017-10-13 13:50:18 -0700 |
---|---|---|
committer | Barton E. Schaefer <schaefer@zsh.org> | 2017-10-13 13:50:18 -0700 |
commit | 1fb6939b94750746de349b6b61115d27fda500f3 (patch) | |
tree | b920ee7e2157d3409010c4ce1cd484e5ef9591a5 /Src | |
parent | 7c36add497883137a9691b994d34e0385b0eab8f (diff) | |
download | zsh-1fb6939b94750746de349b6b61115d27fda500f3.tar.gz zsh-1fb6939b94750746de349b6b61115d27fda500f3.tar.xz zsh-1fb6939b94750746de349b6b61115d27fda500f3.zip |
41873: temporarily disable effects of ${(Z:n:)...} for parsing $(...) within the parameter value
Also fix minor typo in commit b3fa5c52 ChangeLog.
Diffstat (limited to 'Src')
-rw-r--r-- | Src/lex.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Src/lex.c b/Src/lex.c index 8493d4737..e0190afc6 100644 --- a/Src/lex.c +++ b/Src/lex.c @@ -2128,8 +2128,12 @@ skipcomm(void) * function at the history layer --- this is consistent with the * intention of maintaining the history and input layers across * the recursive parsing. + * + * Also turn off LEXFLAGS_NEWLINE because this is already skipping + * across the entire construct, and parse_event() needs embedded + * newlines to be "real" when looking for the OUTPAR token. */ - lexflags &= ~LEXFLAGS_ZLE; + lexflags &= ~(LEXFLAGS_ZLE|LEXFLAGS_NEWLINE); dbparens = 0; /* restored by zcontext_restore_partial() */ if (!parse_event(OUTPAR) || tok != OUTPAR) { |