aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/main.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2021-11-01 11:27:42 -0400
committerGitHub <noreply@github.com>2021-11-01 11:27:42 -0400
commitb8eabb37b1d4e267a4db7e639e8cbdec2ed64b8e (patch)
treed8fc27ffbbb9ece2b15008b09d4b4a6b89d0d20b /src/nvim/main.c
parent961cd83b3b39855b232841f37ded856c8621bd90 (diff)
parent9e479ea05e00e63ccc985fc8ce4912c709f30111 (diff)
downloadrneovim-b8eabb37b1d4e267a4db7e639e8cbdec2ed64b8e.tar.gz
rneovim-b8eabb37b1d4e267a4db7e639e8cbdec2ed64b8e.tar.bz2
rneovim-b8eabb37b1d4e267a4db7e639e8cbdec2ed64b8e.zip
Merge pull request #16131 from jamessan/vim-8.1.0306
Diffstat (limited to 'src/nvim/main.c')
-rw-r--r--src/nvim/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 123872b3df..0409628ed8 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -823,11 +823,11 @@ static void command_line_scan(mparm_T *parmp)
msgpack_packer *p = msgpack_packer_new(&fp, msgpack_file_write);
if (fof_ret != 0) {
- emsgf(_("E5421: Failed to open stdin: %s"), os_strerror(fof_ret));
+ semsg(_("E5421: Failed to open stdin: %s"), os_strerror(fof_ret));
}
if (p == NULL) {
- EMSG(_(e_outofmem));
+ emsg(_(e_outofmem));
}
Object md = DICTIONARY_OBJ(api_metadata());
@@ -1742,7 +1742,7 @@ static bool do_user_initialization(void)
if (os_path_exists(init_lua_path)
&& do_source((char *)init_lua_path, true, DOSO_VIMRC)) {
if (os_path_exists(user_vimrc)) {
- EMSG3(_("E5422: Conflicting configs: \"%s\" \"%s\""), init_lua_path,
+ semsg(_("E5422: Conflicting configs: \"%s\" \"%s\""), init_lua_path,
user_vimrc);
}
@@ -1814,7 +1814,7 @@ static void source_startup_scripts(const mparm_T *const parmp)
// Do nothing.
} else {
if (do_source(parmp->use_vimrc, false, DOSO_NONE) != OK) {
- EMSG2(_("E282: Cannot read from \"%s\""), parmp->use_vimrc);
+ semsg(_("E282: Cannot read from \"%s\""), parmp->use_vimrc);
}
}
} else if (!silent_mode) {