To: vim_dev@googlegroups.com Subject: Patch 8.0.1706 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1706 Problem: Cannot sent CTRL-\ to a terminal window. Solution: Make CTRL-W CTRL-\ send CTRL-\ to a terminal window. Files: src/terminal.c, runtime/doc/terminal.txt *** ../vim-8.0.1705/src/terminal.c 2018-04-10 18:26:22.910554732 +0200 --- src/terminal.c 2018-04-13 21:37:53.991424975 +0200 *************** *** 2056,2061 **** --- 2056,2066 ---- /* "CTRL-W .": send CTRL-W to the job */ c = Ctrl_W; } + else if (termkey == 0 && c == Ctrl_BSL) + { + /* "CTRL-W CTRL-\": send CTRL-\ to the job */ + c = Ctrl_BSL; + } else if (c == 'N') { /* CTRL-W N : go to Terminal-Normal mode. */ *************** *** 2173,2179 **** case 2: return lookup_color( 4, fg, boldp) + 1; /* dark red */ case 3: return lookup_color( 2, fg, boldp) + 1; /* dark green */ case 4: return lookup_color( 6, fg, boldp) + 1; /* brown */ ! case 5: return lookup_color( 1, fg, boldp) + 1; /* dark blue*/ case 6: return lookup_color( 5, fg, boldp) + 1; /* dark magenta */ case 7: return lookup_color( 3, fg, boldp) + 1; /* dark cyan */ case 8: return lookup_color( 8, fg, boldp) + 1; /* light grey */ --- 2178,2184 ---- case 2: return lookup_color( 4, fg, boldp) + 1; /* dark red */ case 3: return lookup_color( 2, fg, boldp) + 1; /* dark green */ case 4: return lookup_color( 6, fg, boldp) + 1; /* brown */ ! case 5: return lookup_color( 1, fg, boldp) + 1; /* dark blue */ case 6: return lookup_color( 5, fg, boldp) + 1; /* dark magenta */ case 7: return lookup_color( 3, fg, boldp) + 1; /* dark cyan */ case 8: return lookup_color( 8, fg, boldp) + 1; /* light grey */ *** ../vim-8.0.1705/runtime/doc/terminal.txt 2018-04-10 15:59:04.287392657 +0200 --- runtime/doc/terminal.txt 2018-04-13 21:38:45.319056026 +0200 *************** *** 72,77 **** --- 72,78 ---- Special in the terminal window: *CTRL-W_.* *CTRL-W_N* CTRL-W . send a CTRL-W to the job in the terminal + CTRL-W CTRL-\ send a CTRL-\ to the job in the terminal CTRL-W N go to Terminal-Normal mode, see |Terminal-mode| CTRL-\ CTRL-N go to Terminal-Normal mode, see |Terminal-mode| CTRL-W " {reg} paste register {reg} *CTRL-W_quote* *** ../vim-8.0.1705/src/version.c 2018-04-13 20:41:24.856374986 +0200 --- src/version.c 2018-04-13 22:05:44.551442885 +0200 *************** *** 764,765 **** --- 764,767 ---- { /* Add new patch number below this line */ + /**/ + 1706, /**/ -- hundred-and-one symptoms of being an internet addict: 172. You join listservers just for the extra e-mail. /// 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 ///