diff options
author | shadmansaleh <shadmansaleh3@gmail.com> | 2021-06-03 07:07:51 +0600 |
---|---|---|
committer | shadmansaleh <shadmansaleh3@gmail.com> | 2021-06-11 01:01:03 +0600 |
commit | e1edc079dd0d0cb4a53e5998086568cf9d10a26a (patch) | |
tree | eb60874111545e69847809a765c8dc6921e37aa2 /src/nvim/main.c | |
parent | 92b6b3764cf75d01bcbf04fcf598140fc01e7902 (diff) | |
download | rneovim-e1edc079dd0d0cb4a53e5998086568cf9d10a26a.tar.gz rneovim-e1edc079dd0d0cb4a53e5998086568cf9d10a26a.tar.bz2 rneovim-e1edc079dd0d0cb4a53e5998086568cf9d10a26a.zip |
refactor(source): Move lua file detection to do_source
So now :source can run lua files too :)
* feat: Add support for :[ranged]source for lua files
Diffstat (limited to 'src/nvim/main.c')
-rw-r--r-- | src/nvim/main.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index e626ad03db..53043d293e 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1101,11 +1101,7 @@ static void command_line_scan(mparm_T *parmp) size_t s_size = STRLEN(a) + 9; char *s = xmalloc(s_size); - if (path_with_extension(a, "lua")) { - snprintf(s, s_size, "luafile %s", a); - } else { - snprintf(s, s_size, "so %s", a); - } + snprintf(s, s_size, "so %s", a); parmp->cmds_tofree[parmp->n_commands] = true; parmp->commands[parmp->n_commands++] = s; } else { @@ -1888,12 +1884,8 @@ static void source_startup_scripts(const mparm_T *const parmp) || strequal(parmp->use_vimrc, "NORC")) { // Do nothing. } else { - if (path_with_extension(parmp->use_vimrc, "lua")) { - 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); - } + if (do_source((char_u *)parmp->use_vimrc, false, DOSO_NONE) != OK) { + EMSG2(_("E282: Cannot read from \"%s\""), parmp->use_vimrc); } } } else if (!silent_mode) { |