To: vim_dev@googlegroups.com Subject: Patch 8.0.1484 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1484 Problem: Reduntant conditions. Solution: Remove them. (Dominique Pelle) Files: src/terminal.c *** ../vim-8.0.1483/src/terminal.c 2018-02-08 22:33:27.836606658 +0100 --- src/terminal.c 2018-02-09 16:44:59.581644142 +0100 *************** *** 523,529 **** init_job_options(&opt); cmd = eap->arg; ! while (*cmd && *cmd == '+' && *(cmd + 1) == '+') { char_u *p, *ep; --- 523,529 ---- init_job_options(&opt); cmd = eap->arg; ! while (*cmd == '+' && *(cmd + 1) == '+') { char_u *p, *ep; *************** *** 3259,3266 **** 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) && STRCMP(job_status(buf->b_term->tl_job), "dead") == 0) { /* The job is dead, keep reading channel I/O until the channel is --- 3259,3265 ---- return; /* Get the job status, this will detect a job that finished. */ ! 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 *** ../vim-8.0.1483/src/version.c 2018-02-09 16:04:18.614716654 +0100 --- src/version.c 2018-02-09 16:45:37.061388357 +0100 *************** *** 773,774 **** --- 773,776 ---- { /* Add new patch number below this line */ + /**/ + 1484, /**/ -- ARTHUR: Well, it doesn't matter. Will you go and tell your master that Arthur from the Court of Camelot is here. GUARD #1: Listen, in order to maintain air-speed velocity, a swallow needs to beat its wings 43 times every second, right? ARTHUR: Please! The Quest for the Holy Grail (Monty Python) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///