diff --git a/runtime/lua/vim/_editor.lua b/runtime/lua/vim/_editor.lua index bb1e979a4d..84dd4ad717 100644 --- a/runtime/lua/vim/_editor.lua +++ b/runtime/lua/vim/_editor.lua @@ -968,6 +968,6 @@ function vim._init_defaults() vim._init_default_autocmds() end -require('vim._meta') +require('vim._options') return vim diff --git a/runtime/lua/vim/_meta.lua b/runtime/lua/vim/_options.lua similarity index 100% rename from runtime/lua/vim/_meta.lua rename to runtime/lua/vim/_options.lua diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index ed1cca57ec..b3c20ead8b 100755 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -271,7 +271,7 @@ set(LUA_LOADER_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/loader.lua) set(LUA_INSPECT_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/inspect.lua) set(LUA_FS_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/fs.lua) set(LUA_F_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/F.lua) -set(LUA_META_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/_meta.lua) +set(LUA_OPTIONS_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/_options.lua) set(LUA_FILETYPE_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/filetype.lua) set(LUA_INIT_PACKAGES_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/_init_packages.lua) set(LUA_KEYMAP_MODULE_SOURCE ${PROJECT_SOURCE_DIR}/runtime/lua/vim/keymap.lua) @@ -511,7 +511,7 @@ add_custom_command( ${LUA_SHARED_MODULE_SOURCE} "vim.shared" ${LUA_LOADER_MODULE_SOURCE} "vim.loader" ${LUA_F_MODULE_SOURCE} "vim.F" - ${LUA_META_MODULE_SOURCE} "vim._meta" + ${LUA_OPTIONS_MODULE_SOURCE} "vim._options" ${LUA_FILETYPE_MODULE_SOURCE} "vim.filetype" ${LUA_KEYMAP_MODULE_SOURCE} "vim.keymap" DEPENDS @@ -522,7 +522,7 @@ add_custom_command( ${LUA_LOADER_MODULE_SOURCE} ${LUA_INSPECT_MODULE_SOURCE} ${LUA_F_MODULE_SOURCE} - ${LUA_META_MODULE_SOURCE} + ${LUA_OPTIONS_MODULE_SOURCE} ${LUA_FILETYPE_MODULE_SOURCE} ${LUA_LOAD_PACKAGE_MODULE_SOURCE} ${LUA_KEYMAP_MODULE_SOURCE} diff --git a/src/nvim/lua/executor.c b/src/nvim/lua/executor.c index 90a9c4caed..e489b0f058 100644 --- a/src/nvim/lua/executor.c +++ b/src/nvim/lua/executor.c @@ -2026,9 +2026,9 @@ void nlua_set_sctx(sctx_T *current) lua_Debug *info = (lua_Debug *)xmalloc(sizeof(lua_Debug)); // Files where internal wrappers are defined so we can ignore them - // like vim.o/opt etc are defined in _meta.lua + // like vim.o/opt etc are defined in _options.lua char *ignorelist[] = { - "vim/_meta.lua", + "vim/_options.lua", "vim/keymap.lua", }; int ignorelist_size = sizeof(ignorelist) / sizeof(ignorelist[0]);