diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2024-05-24 19:18:11 +0000 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2024-05-24 19:18:11 +0000 |
| commit | ff7ed8f586589d620a806c3758fac4a47a8e7e15 (patch) | |
| tree | 729bbcb92231538fa61dab6c3d890b025484b7f5 /src/nvim/main.c | |
| parent | 376914f419eb08fdf4c1a63a77e1f035898a0f10 (diff) | |
| parent | 28c04948a1c887a1cc0cb64de79fa32631700466 (diff) | |
| download | rneovim-ff7ed8f586589d620a806c3758fac4a47a8e7e15.tar.gz rneovim-ff7ed8f586589d620a806c3758fac4a47a8e7e15.tar.bz2 rneovim-ff7ed8f586589d620a806c3758fac4a47a8e7e15.zip | |
Merge remote-tracking branch 'upstream/master' into mix_20240309
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index ea189aaa0c..30b6b6e86b 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -14,7 +14,9 @@ #include <string.h> #ifdef ENABLE_ASAN_UBSAN # include <sanitizer/asan_interface.h> -# include <sanitizer/ubsan_interface.h> +# ifndef MSWIN +# include <sanitizer/ubsan_interface.h> +# endif #endif #include "auto/config.h" // IWYU pragma: keep @@ -61,6 +63,7 @@ #include "nvim/log.h" #include "nvim/lua/executor.h" #include "nvim/lua/secure.h" +#include "nvim/lua/treesitter.h" #include "nvim/macros_defs.h" #include "nvim/main.h" #include "nvim/mark.h" @@ -353,6 +356,12 @@ int main(int argc, char **argv) ui_client_channel_id = rv; } + if (ui_client_channel_id) { + time_finish(); + ui_client_run(remote_ui); // NORETURN + } + assert(!ui_client_channel_id && !use_builtin_ui); + TIME_MSG("expanding arguments"); if (params.diff_mode && params.window_count == -1) { @@ -395,12 +404,6 @@ int main(int argc, char **argv) input_start(); } - if (ui_client_channel_id) { - time_finish(); - ui_client_run(remote_ui); // NORETURN - } - assert(!ui_client_channel_id && !use_builtin_ui); - // Wait for UIs to set up Nvim or show early messages // and prompts (--cmd, swapfile dialog, …). bool use_remote_ui = (embedded_mode && !headless_mode); @@ -639,7 +642,7 @@ int main(int argc, char **argv) // WORKAROUND(mhi): #3023 if (cb_flags & CB_UNNAMEDMASK) { - eval_has_provider("clipboard"); + eval_has_provider("clipboard", false); } if (params.luaf != NULL) { @@ -1573,7 +1576,7 @@ static void handle_quickfix(mparm_T *paramp) { if (paramp->edit_type == EDIT_QF) { if (paramp->use_ef != NULL) { - set_string_option_direct(kOptErrorfile, paramp->use_ef, 0, SID_CARG); + set_option_direct(kOptErrorfile, CSTR_AS_OPTVAL(paramp->use_ef), 0, SID_CARG); } vim_snprintf(IObuff, IOSIZE, "cfile %s", p_ef); if (qf_init(NULL, p_ef, p_efm, true, IObuff, p_menc) < 0) { |