From 1fb6939b94750746de349b6b61115d27fda500f3 Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Fri, 13 Oct 2017 13:50:18 -0700
Subject: 41873: temporarily disable effects of ${(Z:n:)...} for parsing $(...)
 within the parameter value

Also fix minor typo in commit b3fa5c52 ChangeLog.
---
 Src/lex.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Src')

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) {
-- 
cgit 1.4.1