From 3b32abafdb019cfb8f29908bc3d148e01518981d Mon Sep 17 00:00:00 2001
From: Peter Stephenson <p.w.stephenson@ntlworld.com>
Date: Sat, 10 Jan 2015 20:28:57 +0000
Subject: [PATCH] 34220: new $(...) handling needs to back up over alias
 expansion

---
 ChangeLog   | 3 +++
 Src/input.c | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e06c2f1b4..83b90c0cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-01-10  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
+	* 34220: Src/input.c: new $(...) parsing didn't back up over
+	alias expansions.
+
 	* unposted: Src/context.c: update copyright.
 
 	* 34195: Thomas Mitterfellner: Completion/Linux/Command/_qdbus:
diff --git a/Src/input.c b/Src/input.c
index 04dda5acd..2ecac7bdc 100644
--- a/Src/input.c
+++ b/Src/input.c
@@ -537,6 +537,12 @@ inpush(char *str, int flags, Alias inalias)
 static void
 inpoptop(void)
 {
+    if (!lexstop) {
+	inbufflags &= ~INP_ALCONT;
+	while (inbufptr > inbuf)
+	    inungetc(inbufptr[-1]);
+    }
+
     if (inbuf && (inbufflags & INP_FREE))
 	free(inbuf);