patch 8.0.1484: reduntant conditions

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

diff --git a/src/terminal.c b/src/terminal.c
index 56c250b569900df57f6de8559e84498a7493b850..02d071525ac3fb0e0e47fbf76cbb1a284f68cfc3 100644 (file)
--- 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 7e07f77353de851411f41a7521f2589b1f095ee4..f56ef3577427fe367dcdac9000ac06a67044be20 100644 (file)
--- 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,
 /**/