From a15ef4588c057da87f64be5b17aef35aaead8ac8 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 9 Feb 2018 16:46:00 +0100 Subject: patch 8.0.1484: reduntant conditions Problem: Reduntant conditions. Solution: Remove them. (Dominique Pelle) --- src/terminal.c | 5 ++--- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/terminal.c b/src/terminal.c index 56c250b56..02d071525 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -523,7 +523,7 @@ ex_terminal(exarg_T *eap) init_job_options(&opt); cmd = eap->arg; - while (*cmd && *cmd == '+' && *(cmd + 1) == '+') + while (*cmd == '+' && *(cmd + 1) == '+') { char_u *p, *ep; @@ -3259,8 +3259,7 @@ f_term_wait(typval_T *argvars, typval_T *rettv UNUSED) return; /* Get the job status, this will detect a job that finished. */ - if ((buf->b_term->tl_job->jv_channel == NULL - || !buf->b_term->tl_job->jv_channel->ch_keep_open) + if (!buf->b_term->tl_job->jv_channel->ch_keep_open && STRCMP(job_status(buf->b_term->tl_job), "dead") == 0) { /* The job is dead, keep reading channel I/O until the channel is diff --git a/src/version.c b/src/version.c index 7e07f7735..f56ef3577 100644 --- a/src/version.c +++ b/src/version.c @@ -771,6 +771,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1484, /**/ 1483, /**/ -- cgit v1.2.1