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 /Src/hist.c | |
| parent | 35873: add original test for process substitution deadlock from 35847 (diff) | |
| download | zsh-8f8b82bc6c7ecc22bca90d624fc65e3499e43113.tar zsh-8f8b82bc6c7ecc22bca90d624fc65e3499e43113.tar.gz zsh-8f8b82bc6c7ecc22bca90d624fc65e3499e43113.tar.bz2 zsh-8f8b82bc6c7ecc22bca90d624fc65e3499e43113.tar.lz zsh-8f8b82bc6c7ecc22bca90d624fc65e3499e43113.tar.xz zsh-8f8b82bc6c7ecc22bca90d624fc65e3499e43113.tar.zst zsh-8f8b82bc6c7ecc22bca90d624fc65e3499e43113.zip | |
35883: Don't attempt to back up over history if expanding alias
Diffstat (limited to 'Src/hist.c')
| -rw-r--r-- | Src/hist.c | 3 |
1 files changed, 2 insertions, 1 deletions
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('\\'); |