From f135e511c0ef8b32aac68d43e2627b8d033e23da Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 6 Mar 2021 07:59:26 -0500 Subject: vim-patch:8.1.1016: MS-Windows: No color in shell when using "!" in 'guioptions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: MS-Windows: No color in shell when using "!" in 'guioptions. Solution: Don't stop termcap when using a terminal window for the shell. (vim-jp, closes vim/vim#4117) https://github.com/vim/vim/commit/049ca59236d5a981f23cf5dfe40f54536fe7cad2 N/A patches for version.c: vim-patch:8.2.0890: no color in terminal window when 'termguicolor' is set Problem: No color in terminal window when 'termguicolor' is set. Solution: Clear the underline color. (closes vim/vim#6186) https://github.com/vim/vim/commit/1e5f8f6d65b2ecff3d93d9fdbdd17c7a2ab9cc3d vim-patch:8.2.1805: Unix: terminal mode changed when using ":shell" Problem: Unix: terminal mode changed when using ":shell". Solution: Avoid calling settmode() when not needed. (issue vim/vim#7079) https://github.com/vim/vim/commit/80361a5f2b134c88597d60b3d363b52084e712a1 vim-patch:8.2.2345: no focus events in a terminal Problem: No focus events in a terminal. Solution: Add the t_fd and t_fe termcap entries and implement detecting focus events. (Hayaki Saito, Magnus Groß, closes vim/vim#7673, closes vim/vim#609, closes vim/vim#5526) https://github.com/vim/vim/commit/681fc3fa782e99fe69ed2c83c3e29109d2d61e1a vim-patch:8.2.2564: focus events end Insert mode if 'esckeys' is not set Problem: Focus events end Insert mode if 'esckeys' is not set. Solution: Do not enable focus events when 'esckeys' is off. (closes vim/vim#7926) https://github.com/vim/vim/commit/51b477f74f0de11f6f92a65590f358e04a60a099 --- src/nvim/ex_cmds.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 103c081143..854faf5377 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -1407,19 +1407,20 @@ do_shell( * For autocommands we want to get the output on the current screen, to * avoid having to type return below. */ - msg_putchar('\r'); /* put cursor at start of line */ - msg_putchar('\n'); /* may shift screen one line up */ + msg_putchar('\r'); // put cursor at start of line + msg_putchar('\n'); // may shift screen one line up - /* warning message before calling the shell */ + // warning message before calling the shell if (p_warn && !autocmd_busy - && msg_silent == 0) + && msg_silent == 0) { FOR_ALL_BUFFERS(buf) { if (bufIsChanged(buf)) { MSG_PUTS(_("[No write since last change]\n")); break; } } + } // This ui_cursor_goto is required for when the '\n' resulted in a "delete line // 1" command to the terminal. -- cgit