diff options
| author | Kamil Dudka <kdudka@redhat.com> | 2019-07-26 17:24:59 +0200 |
|---|---|---|
| committer | Peter Stephenson <p.stephenson@samsung.com> | 2019-07-26 16:36:14 +0100 |
| commit | d6a9e222ec6b006c09d6f84beae6ef488a19b214 (patch) | |
| tree | 966799a824bb062619f6ae91b99c594a5afa316e | |
| parent | f9cd2187875b6f2ebdb9b9a787fac20b2aaf745b (diff) | |
| download | zsh-d6a9e222ec6b006c09d6f84beae6ef488a19b214.tar.gz zsh-d6a9e222ec6b006c09d6f84beae6ef488a19b214.tar.xz zsh-d6a9e222ec6b006c09d6f84beae6ef488a19b214.zip | |
44582: Fix foregoing commit to use DPUTS() better
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/zle_utils.c | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 3cb564372..5405155f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-07-26 Peter Stephenson <p.stephenson@samsung.com> + + * Kamil: 44582: Src/Zle/zle_utils.c: update to foregoing to + use DPUTS() properly. + 2019-07-24 Peter Stephenson <p.stephenson@samsung.com> * Kamil: 44566: Src/Zle/zle_utils.c: make failed searches of diff --git a/Src/Zle/zle_utils.c b/Src/Zle/zle_utils.c index d549b885b..2b306fdcd 100644 --- a/Src/Zle/zle_utils.c +++ b/Src/Zle/zle_utils.c @@ -1608,10 +1608,9 @@ unapplychange(struct change *ch) { if(ch->hist != histline) { Histent he = quietgethist(ch->hist); - if(!he) { - dputs(ERRMSG("quietgethist(ch->hist) returned NULL")); + DPUTS(he == NULL, "quietgethist(ch->hist) returned NULL"); + if(he == NULL) return 1; - } zle_setline(he); zlecs = ch->new_cs; return 0; @@ -1653,10 +1652,9 @@ applychange(struct change *ch) { if(ch->hist != histline) { Histent he = quietgethist(ch->hist); - if(!he) { - dputs(ERRMSG("quietgethist(ch->hist) returned NULL")); + DPUTS(he == NULL, "quietgethist(ch->hist) returned NULL"); + if(he == NULL) return 1; - } zle_setline(he); zlecs = ch->old_cs; return 0; |