To: vim_dev@googlegroups.com Subject: Patch 8.0.1611 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1611 Problem: CTRL-W in system terminal does not go to job. Solution: Do not use CTRL-W as a terminal command in a system terminal. Files: src/terminal.c *** ../vim-8.0.1610/src/terminal.c 2018-03-16 21:34:19.901613773 +0100 --- src/terminal.c 2018-03-16 22:16:41.099925257 +0100 *************** *** 2007,2014 **** if (ctrl_break_was_pressed) mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill"); #endif ! /* Was either CTRL-W (termkey) or CTRL-\ pressed? */ ! if (c == (termkey == 0 ? Ctrl_W : termkey) || c == Ctrl_BSL) { int prev_c = c; --- 2007,2019 ---- if (ctrl_break_was_pressed) mch_signal_job(curbuf->b_term->tl_job, (char_u *)"kill"); #endif ! /* Was either CTRL-W (termkey) or CTRL-\ pressed? ! * Not in a system terminal. */ ! if ((c == (termkey == 0 ? Ctrl_W : termkey) || c == Ctrl_BSL) ! #ifdef FEAT_GUI ! && !curbuf->b_term->tl_system ! #endif ! ) { int prev_c = c; *** ../vim-8.0.1610/src/version.c 2018-03-16 21:34:19.901613773 +0100 --- src/version.c 2018-03-16 22:18:20.071399761 +0100 *************** *** 768,769 **** --- 768,771 ---- { /* Add new patch number below this line */ + /**/ + 1611, /**/ -- How To Keep A Healthy Level Of Insanity: 2. Page yourself over the intercom. Don't disguise your voice. /// 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 ///