# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1518192007 -3600
# Node ID 4b8d89ea9edbeef26863c06f5c628fabd36b8958
# Parent  146652fabe82c95942bb978a940c9375a6c94419
patch 8.0.1484: reduntant conditions

commit https://github.com/vim/vim/commit/a15ef4588c057da87f64be5b17aef35aaead8ac8
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Feb 9 16:46:00 2018 +0100

    patch 8.0.1484: reduntant conditions

    Problem:    Reduntant conditions.
    Solution:   Remove them. (Dominique Pelle)

diff --git a/src/terminal.c b/src/terminal.c
--- 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 
 	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
--- 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,