mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-16 16:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

executor: use new nlua_ name pattern

Browse Source
This commit is contained in:
Björn Linse
2020-09-17 14:36:55 +02:00
parent c65d3fd67b
commit eb387ae530
2 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/main.c
View File

@@ -1778,7 +1778,7 @@ static bool do_user_initialization(void)
char_u *init_lua_path = (char_u *)stdpaths_user_conf_subpath("init.lua");
if (os_path_exists(init_lua_path)
&& load_init_lua((const char *)init_lua_path)) {
&& nlua_exec_file((const char *)init_lua_path)) {
os_setenv("MYVIMRC", (const char *)init_lua_path, 1);
char_u *vimrc_path = (char_u *)stdpaths_user_conf_subpath("init.vim");
@@ -1852,7 +1852,7 @@ static void source_startup_scripts(const mparm_T *const parmp)
// Do nothing.
} else {
if (path_with_extension(parmp->use_vimrc, "lua")) {
load_init_lua(parmp->use_vimrc);
nlua_exec_file(parmp->use_vimrc);
} else {
if (do_source((char_u *)parmp->use_vimrc, false, DOSO_NONE) != OK) {
EMSG2(_("E282: Cannot read from \"%s\""), parmp->use_vimrc);