IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14070 from janlazo/vim-8.2.2564

Browse Source 
vim-patch:8.1.1016,8.2.{890,1513,1805,2345,2564}
This commit is contained in:
Jan Edmund Lazo 2021-03-07 15:56:23 -05:00 committed by GitHub
commit c12ea02e0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/ex_cmds.c
View File

@ -1407,19 +1407,20 @@ do_shell(
* For autocommands we want to get the output on the current screen, to * For autocommands we want to get the output on the current screen, to
* avoid having to type return below. * avoid having to type return below.
*/ */
msg_putchar('\r'); /* put cursor at start of line */ msg_putchar('\r'); // put cursor at start of line
msg_putchar('\n'); /* may shift screen one line up */ msg_putchar('\n'); // may shift screen one line up
/* warning message before calling the shell */ // warning message before calling the shell
if (p_warn if (p_warn
&& !autocmd_busy && !autocmd_busy
&& msg_silent == 0) && msg_silent == 0) {
FOR_ALL_BUFFERS(buf) { FOR_ALL_BUFFERS(buf) {
if (bufIsChanged(buf)) { if (bufIsChanged(buf)) {
MSG_PUTS(_("[No write since last change]\n")); MSG_PUTS(_("[No write since last change]\n"));
break; break;
} }
} }
}
// This ui_cursor_goto is required for when the '\n' resulted in a "delete line // This ui_cursor_goto is required for when the '\n' resulted in a "delete line
// 1" command to the terminal. // 1" command to the terminal.

2
src/nvim/if_cscope.c
View File

@ -1865,7 +1865,7 @@ static void cs_release_csp(size_t i, bool freefnpp)
alive = false; // cscope process no longer exists alive = false; // cscope process no longer exists
break; break;
} }
os_delay(50L, false); // sleep 50ms os_delay(50L, false); // sleep 50 ms
} }
} }
if (alive) if (alive)