1 files changed, 8 insertions, 8 deletions

diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index 2bff65b241..6ef0aa1091 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -159,7 +159,7 @@ int os_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file
 
   // get a name for the temp file
   if ((tempname = vim_tempname()) == NULL) {
-    EMSG(_(e_notmp));
+    emsg(_(e_notmp));
     return FAIL;
   }
 
@@ -341,7 +341,7 @@ int os_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file
     if (!(flags & EW_SILENT)) {
       msg_putchar('\n');                // clear bottom line quickly
       cmdline_row = Rows - 1;           // continue on last line
-      MSG(_(e_wildexpand));
+      msg(_(e_wildexpand));
       msg_start();                    // don't overwrite this message
     }
 
@@ -358,7 +358,7 @@ int os_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file
   if (fd == NULL) {
     // Something went wrong, perhaps a file name with a special char.
     if (!(flags & EW_SILENT)) {
-      MSG(_(e_wildexpand));
+      msg(_(e_wildexpand));
       msg_start();                      // don't overwrite this message
     }
     xfree(tempname);
@@ -389,7 +389,7 @@ int os_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u ***file
   os_remove((char *)tempname);
   if (readlen != len) {
     // unexpected read error
-    EMSG2(_(e_notread), tempname);
+    semsg(_(e_notread), tempname);
     xfree(tempname);
     xfree(buffer);
     return FAIL;
@@ -670,7 +670,7 @@ int os_call_shell(char_u *cmd, ShellOpts opts, char_u *extra_args)
   }
 
   if (!emsg_silent && exitcode != 0 && !(opts & kShellOptSilent)) {
-    MSG_PUTS(_("\nshell returned "));
+    msg_puts(_("\nshell returned "));
     msg_outnum(exitcode);
     msg_putchar('\n');
   }
@@ -742,9 +742,9 @@ static int do_os_system(char **argv, const char *input, size_t len, char **outpu
     loop_poll_events(&main_loop, 0);
     // Failed, probably 'shell' is not executable.
     if (!silent) {
-      MSG_PUTS(_("\nshell failed to start: "));
+      msg_puts(_("\nshell failed to start: "));
       msg_outtrans((char_u *)os_strerror(status));
-      MSG_PUTS(": ");
+      msg_puts(": ");
       msg_outtrans((char_u *)prog);
       msg_putchar('\n');
     }
@@ -1180,7 +1180,7 @@ static void shell_write_cb(Stream *stream, void *data, int status)
   if (status) {
     // Can happen if system() tries to send input to a shell command that was
     // backgrounded (:call system("cat - &", "foo")). #3529 #5241
-    msg_schedule_emsgf(_("E5677: Error writing input to shell-command: %s"),
+    msg_schedule_semsg(_("E5677: Error writing input to shell-command: %s"),
                        uv_err_name(status));
   }
   stream_close(stream, NULL, NULL);