diff options
| author | bfredl <bjorn.linse@gmail.com> | 2023-04-20 14:41:47 +0200 |
|---|---|---|
| committer | bfredl <bjorn.linse@gmail.com> | 2023-04-20 19:00:38 +0200 |
| commit | ffaf74f1477d3182ffc70bcc9913effc44c90ea7 (patch) | |
| tree | a42c9984fb7564e57c79a1c47fb8f18275f614e6 /src/nvim/generators | |
| parent | dbcd1985d13b02ab7a547d0b97d4ede28fa49b96 (diff) | |
| download | rneovim-ffaf74f1477d3182ffc70bcc9913effc44c90ea7.tar.gz rneovim-ffaf74f1477d3182ffc70bcc9913effc44c90ea7.tar.bz2 rneovim-ffaf74f1477d3182ffc70bcc9913effc44c90ea7.zip | |
fix(build): distinguish vim.mpack from global require'mpack'
problem: the api of vim.mpack is not compatible with a system provided mpack
solution: don't require 'mpack' directly from the system path
Diffstat (limited to 'src/nvim/generators')
| -rw-r--r-- | src/nvim/generators/gen_api_dispatch.lua | 2 | ||||
| -rwxr-xr-x | src/nvim/generators/gen_api_ui_events.lua | 2 | ||||
| -rw-r--r-- | src/nvim/generators/gen_eval.lua | 2 | ||||
| -rw-r--r-- | src/nvim/generators/preload.lua | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/generators/gen_api_dispatch.lua b/src/nvim/generators/gen_api_dispatch.lua index ad7018e385..244921de31 100644 --- a/src/nvim/generators/gen_api_dispatch.lua +++ b/src/nvim/generators/gen_api_dispatch.lua @@ -1,4 +1,4 @@ -local mpack = require('mpack') +local mpack = vim.mpack local hashy = require'generators.hashy' diff --git a/src/nvim/generators/gen_api_ui_events.lua b/src/nvim/generators/gen_api_ui_events.lua index c6a5d1d2a3..e2af5f8d44 100755 --- a/src/nvim/generators/gen_api_ui_events.lua +++ b/src/nvim/generators/gen_api_ui_events.lua @@ -1,4 +1,4 @@ -local mpack = require('mpack') +local mpack = vim.mpack assert(#arg == 5) local input = io.open(arg[1], 'rb') diff --git a/src/nvim/generators/gen_eval.lua b/src/nvim/generators/gen_eval.lua index 15e4c6540a..e574efdf99 100644 --- a/src/nvim/generators/gen_eval.lua +++ b/src/nvim/generators/gen_eval.lua @@ -1,4 +1,4 @@ -local mpack = require('mpack') +local mpack = vim.mpack local autodir = arg[1] local metadata_file = arg[2] diff --git a/src/nvim/generators/preload.lua b/src/nvim/generators/preload.lua index e5c8bd545b..4b7fde2c39 100644 --- a/src/nvim/generators/preload.lua +++ b/src/nvim/generators/preload.lua @@ -4,6 +4,7 @@ package.path = srcdir .. '/src/nvim/?.lua;' ..srcdir .. '/runtime/lua/?.lua;' .. _G.vim = require'vim.shared' _G.vim.inspect = require 'vim.inspect' package.cpath = package.cpath .. ';' .. nlualib +require 'nlua0' arg[0] = table.remove(arg, 1) return loadfile(arg[0])() |