diff options
author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-01-10 20:28:57 +0000 |
---|---|---|
committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-01-10 20:28:57 +0000 |
commit | 3b32abafdb019cfb8f29908bc3d148e01518981d (patch) | |
tree | 1f30cd6730b79999f5cb55552224ca9a4d0ceeb7 | |
parent | 81ad9ed76634173f9563eb155cf00c5e25169c5a (diff) | |
download | zsh-3b32abafdb019cfb8f29908bc3d148e01518981d.tar.gz zsh-3b32abafdb019cfb8f29908bc3d148e01518981d.tar.xz zsh-3b32abafdb019cfb8f29908bc3d148e01518981d.zip |
34220: new $(...) handling needs to back up over alias expansion
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Src/input.c | 6 |
2 files changed, 9 insertions, 0 deletions
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); |