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