diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-02-09 16:46:00 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-02-09 16:46:00 +0100 |
| commit | a15ef4588c057da87f64be5b17aef35aaead8ac8 (patch) | |
| tree | ab7a31aa6eddca5f18a66db878a4a1075450379e | |
| parent | 9d32276b52a63fccfae681f0d1d6ccb66efec1c0 (diff) | |
| download | vim-git-a15ef4588c057da87f64be5b17aef35aaead8ac8.tar.gz | |
patch 8.0.1484: reduntant conditionsv8.0.1484
Problem: Reduntant conditions.
Solution: Remove them. (Dominique Pelle)
| -rw-r--r-- | src/terminal.c | 5 | ||||
| -rw-r--r-- | 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 @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1484, +/**/ 1483, /**/ 1482, |