Merge pull request #14070 from janlazo/vim-8.2.2564

vim-patch:8.1.1016,8.2.{890,1513,1805,2345,2564}

2 files changed, 6 insertions, 5 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.
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index 2dad8fb781..31615e744a 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -1865,7 +1865,7 @@ static void cs_release_csp(size_t i, bool freefnpp)
             alive = false;             // cscope process no longer exists
             break;
           }
-          os_delay(50L, false);           // sleep 50ms
+          os_delay(50L, false);  // sleep 50 ms
         }
       }
       if (alive)