1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-17 00:31:09 +02:00

35883: Don't attempt to back up over history if expanding alias

This commit is contained in:
Peter Stephenson 2015-07-24 10:19:00 +01:00
parent 53fe58a278
commit 8f8b82bc6c
2 changed files with 7 additions and 1 deletions

View file

@ -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:

View file

@ -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('\\');