From 41709831aeccf0db3a054a7843f68e6491df14b1 Mon Sep 17 00:00:00 2001 From: bfredl Date: Sat, 4 Jun 2022 18:35:28 +0200 Subject: [PATCH] fix(startup): nvim with --clean should not load user rplugins runtime rplugins such like legacy script providers are not affected by this change. (cherry picked from commit aad20de5ab544980769f32abc0bf61b37a6998e6) --- runtime/plugin/rplugin.vim | 4 +++- src/nvim/main.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/runtime/plugin/rplugin.vim b/runtime/plugin/rplugin.vim index 122d8d47f8..52f4bd05bc 100644 --- a/runtime/plugin/rplugin.vim +++ b/runtime/plugin/rplugin.vim @@ -62,4 +62,6 @@ endfunction command! -bar UpdateRemotePlugins call remote#host#UpdateRemotePlugins() -call s:LoadRemotePlugins() +if index(v:argv, "--clean") < 0 + call s:LoadRemotePlugins() +endif diff --git a/src/nvim/main.c b/src/nvim/main.c index 6ea1cb0875..d9e798064a 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -263,6 +263,8 @@ int main(int argc, char **argv) nlua_init(); + TIME_MSG("init lua interpreter"); + if (embedded_mode) { const char *err; if (!channel_from_stdio(true, CALLBACK_READER_INIT, &err)) {