diff options
author | Peter Stephenson <pws@zsh.org> | 2015-07-24 10:19:00 +0100 |
---|---|---|
committer | Peter Stephenson <pws@zsh.org> | 2015-07-24 10:19:00 +0100 |
commit | 8f8b82bc6c7ecc22bca90d624fc65e3499e43113 (patch) | |
tree | 9d8ad1ebd38f269afc8abd0f60e3e9ac26ab8ef5 | |
parent | 53fe58a27825c0eaa95a9aa459650baa69c55aa2 (diff) | |
download | zsh-8f8b82bc6c7ecc22bca90d624fc65e3499e43113.tar.gz zsh-8f8b82bc6c7ecc22bca90d624fc65e3499e43113.tar.xz zsh-8f8b82bc6c7ecc22bca90d624fc65e3499e43113.zip |
35883: Don't attempt to back up over history if expanding alias
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Src/hist.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index c97657e93..2cd50e6cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-07-24 Peter Stephenson <p.stephenson@samsung.com> + + * 35883: Src/hist.c: Don't attempt to back up over history if + expanding alias. + 2015-07-23 Peter Stephenson <p.stephenson@samsung.com> * 35873: Test/D03procsubst.ztst: add original test from 35847: diff --git a/Src/hist.c b/Src/hist.c index cf224cb4e..75e809c48 100644 --- a/Src/hist.c +++ b/Src/hist.c @@ -906,7 +906,8 @@ ihungetc(int c) while (!lexstop && !errflag) { if (hptr[-1] != (char) c && stophist < 4 && hptr > chline + 1 && hptr[-1] == '\n' && hptr[-2] == '\\' && - !(histactive & HA_UNGET)) { + !(histactive & HA_UNGET) && + (inbufflags & (INP_ALIAS|INP_HIST)) != INP_ALIAS) { histactive |= HA_UNGET; hungetc('\n'); hungetc('\\'); |