diff --git a/cmd/micro/micro_test.go b/cmd/micro/micro_test.go index 7ee521cb73..3cee25e297 100644 --- a/cmd/micro/micro_test.go +++ b/cmd/micro/micro_test.go @@ -36,7 +36,6 @@ func startup(args []string) (tcell.SimulationScreen, error) { } config.InitRuntimeFiles() - config.InitPlugins() err = config.ReadSettings() if err != nil { diff --git a/internal/buffer/buffer_test.go b/internal/buffer/buffer_test.go index 167144264a..305d162748 100644 --- a/internal/buffer/buffer_test.go +++ b/internal/buffer/buffer_test.go @@ -20,8 +20,6 @@ type operation struct { func init() { ulua.L = lua.NewState() - config.InitRuntimeFiles() - config.InitPlugins() config.InitGlobalSettings() config.GlobalSettings["backup"] = false config.GlobalSettings["fastdirty"] = true diff --git a/internal/config/rtfiles.go b/internal/config/rtfiles.go index 53820c5f78..b43016ce6c 100644 --- a/internal/config/rtfiles.go +++ b/internal/config/rtfiles.go @@ -39,6 +39,10 @@ type RuntimeFile interface { var allFiles [][]RuntimeFile var realFiles [][]RuntimeFile +func init() { + initRuntimeVars() +} + func initRuntimeVars() { allFiles = make([][]RuntimeFile, NumTypes) realFiles = make([][]RuntimeFile, NumTypes) diff --git a/internal/config/rtfiles_test.go b/internal/config/rtfiles_test.go index 694e4686ed..de6525ef2c 100644 --- a/internal/config/rtfiles_test.go +++ b/internal/config/rtfiles_test.go @@ -8,7 +8,6 @@ import ( func init() { InitRuntimeFiles() - InitPlugins() } func TestAddFile(t *testing.T) {