diff options
| author | shadmansaleh <shadmansaleh3@gmail.com> | 2021-06-20 23:07:04 +0600 |
|---|---|---|
| committer | shadmansaleh <shadmansaleh3@gmail.com> | 2021-06-21 13:07:05 +0600 |
| commit | b4ac8780267d9164a84deaec27fbc6260f765514 (patch) | |
| tree | e9a4454533f545ff30858e3414be828a1c64b172 /src | |
| parent | b4a216f7ed417e2f1afa321883da1f9fac921aac (diff) | |
| download | rneovim-b4ac8780267d9164a84deaec27fbc6260f765514.tar.gz rneovim-b4ac8780267d9164a84deaec27fbc6260f765514.tar.bz2 rneovim-b4ac8780267d9164a84deaec27fbc6260f765514.zip | |
fix(source): Source giving E484 & parsing error at line 1 for lua files
It's happening because do_source is only expected to return FAIL when it
was unable to open file . But `nlua_exec_file` returns fail for parsing
and execution error too . Those errors are emitted through `nlua_error`.
So now return value of nlua_exec_file is ignored like do_cmdline. It now
only returns fail when it was unable to open file that check is done
before calling nlua_exec_file or do_cmdline. Errors in nlua_exec_file
are still directly emitted through nlua_error like before.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index dd9444f837..9d500a8ddb 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -3011,15 +3011,15 @@ int do_source(char_u *fname, int check_other, int is_vimrc) current_sctx.sc_lnum = 0; sourcing_lnum = 0; // Source the file as lua - retval = (int)nlua_exec_file((const char *)fname); + nlua_exec_file((const char *)fname); current_sctx = current_sctx_backup; sourcing_lnum = sourcing_lnum_backup; } else { // Call do_cmdline, which will call getsourceline() to get the lines. do_cmdline(firstline, getsourceline, (void *)&cookie, DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_REPEAT); - retval = OK; } + retval = OK; if (l_do_profiling == PROF_YES) { // Get "si" again, "script_items" may have been reallocated. |