diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2020-02-14 01:58:20 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2020-02-14 01:58:20 +0100 |
| commit | bfc5d42735c1660263904ec5254cccf539a0a458 (patch) | |
| tree | 9bbb81b4a53941427e6f9e65ae55027d9108df8c /Src/Zle/zle_utils.c | |
| parent | 74561cc51b8867e43cb2937ab2edfb36e2a829bf (diff) | |
| parent | 643de931640e01aa246723d2038328ef33737965 (diff) | |
| download | zsh-bfc5d42735c1660263904ec5254cccf539a0a458.tar.gz zsh-bfc5d42735c1660263904ec5254cccf539a0a458.zip | |
Merge tag 'zsh-5.7.1-test-3' into debian
Test release: 5.7.1-test-3
Diffstat (limited to 'Src/Zle/zle_utils.c')
| -rw-r--r-- | Src/Zle/zle_utils.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Src/Zle/zle_utils.c b/Src/Zle/zle_utils.c index c6df3d89c..2b306fdcd 100644 --- a/Src/Zle/zle_utils.c +++ b/Src/Zle/zle_utils.c @@ -1607,7 +1607,11 @@ static int unapplychange(struct change *ch) { if(ch->hist != histline) { - zle_setline(quietgethist(ch->hist)); + Histent he = quietgethist(ch->hist); + DPUTS(he == NULL, "quietgethist(ch->hist) returned NULL"); + if(he == NULL) + return 1; + zle_setline(he); zlecs = ch->new_cs; return 0; } @@ -1647,7 +1651,11 @@ static int applychange(struct change *ch) { if(ch->hist != histline) { - zle_setline(quietgethist(ch->hist)); + Histent he = quietgethist(ch->hist); + DPUTS(he == NULL, "quietgethist(ch->hist) returned NULL"); + if(he == NULL) + return 1; + zle_setline(he); zlecs = ch->old_cs; return 0; } @@ -1733,7 +1741,7 @@ zlecallhook(char *name, char *arg) args[0] = arg; args[1] = NULL; - execzlefunc(thingy, args, 1); + execzlefunc(thingy, args, 1, 0); unrefthingy(thingy); /* Retain any user interrupt error status */ |