From 59235205c6c8b189b7227f206754aaf485010136 Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Wed, 18 Nov 2015 11:11:37 -0800 Subject: 37145: suppress alias expansion in skipcomm() Thus defer parsing aliases in $(...) et al. into the subshell --- ChangeLog | 5 +++++ Src/lex.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 86de73a25..59b3cc6d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-11-18 Barton E. Schaefer + + * 37145: Src/lex.c: suppress alias expansion in skipcomm() to + defer parsing aliases in $(...) et al. into the subshell + 2015-11-18 Peter Stephenson * 37140: Doc/Zsh/expn.yo: note that <<(...) is < <(...). diff --git a/Src/lex.c b/Src/lex.c index 81904c171..0f260d08f 100644 --- a/Src/lex.c +++ b/Src/lex.c @@ -2022,7 +2022,9 @@ skipcomm(void) int new_lexstop, new_lex_add_raw; int save_infor = infor; struct lexbufstate new_lexbuf; + int noalias = noaliases; + noaliases = 1; infor = 0; cmdpush(CS_CMDSUBST); SETPARBEGIN @@ -2140,6 +2142,7 @@ skipcomm(void) SETPAREND cmdpop(); infor = save_infor; + noaliases = noalias; return lexstop; #endif -- cgit 1.4.1