2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 86de73a25..59b3cc6d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-18  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 37145: Src/lex.c: suppress alias expansion in skipcomm() to
+	defer parsing aliases in $(...) et al. into the subshell
+
 2015-11-18  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 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