aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/os/shell.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2021-10-23 16:04:37 -0400
committerJames McCoy <jamessan@jamessan.com>2021-11-01 06:41:29 -0400
commite6ff154be6da8bd53b604fb6e38686acae75b24f (patch)
tree8424fa376151d9eabfe5a23c54f19ec4e22ba7ea /src/nvim/os/shell.c
parentefa924f66b183d9cf2404ce91c4f009c27e0515a (diff)
downloadrneovim-e6ff154be6da8bd53b604fb6e38686acae75b24f.tar.gz
rneovim-e6ff154be6da8bd53b604fb6e38686acae75b24f.tar.bz2
rneovim-e6ff154be6da8bd53b604fb6e38686acae75b24f.zip
vim-patch:8.1.0779: argument for message functions is inconsistent
Problem: Argument for message functions is inconsistent. Solution: Make first argument to msg() "char *". https://github.com/vim/vim/commit/32526b3c1846025f0e655f41efd4e5428da16b6c
Diffstat (limited to 'src/nvim/os/shell.c')
-rw-r--r--src/nvim/os/shell.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index 1399fc758c..6ef0aa1091 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -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);
@@ -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');
}