diff options
| author | bfredl <bjorn.linse@gmail.com> | 2024-05-16 22:04:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-16 22:04:04 +0200 |
| commit | 06135cc21571b2707121e31176f544a0e0901e1d (patch) | |
| tree | 0a2ed3ed850ae26521b5965cbc620d46316727d4 | |
| parent | 50749f8df89d7a74ea17d51b28e737e043ac6c51 (diff) | |
| parent | d049752e45c3e961fc8cca5fe79ecef4de6c97c7 (diff) | |
| download | rneovim-06135cc21571b2707121e31176f544a0e0901e1d.tar.gz rneovim-06135cc21571b2707121e31176f544a0e0901e1d.tar.bz2 rneovim-06135cc21571b2707121e31176f544a0e0901e1d.zip | |
Merge pull request #28785 from bfredl/nilversion
fix(version): fix vim.version().prerelease
| -rw-r--r-- | src/nvim/generators/gen_api_dispatch.lua | 6 | ||||
| -rw-r--r-- | src/nvim/generators/nvim_version.lua.in | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/nvim/generators/gen_api_dispatch.lua b/src/nvim/generators/gen_api_dispatch.lua index 8ad5858c12..62c99ce082 100644 --- a/src/nvim/generators/gen_api_dispatch.lua +++ b/src/nvim/generators/gen_api_dispatch.lua @@ -260,7 +260,11 @@ fixdict(1 + #version) for _, item in ipairs(version) do -- NB: all items are mandatory. But any error will be less confusing -- with placeholder vim.NIL (than invalid mpack data) - put(item[1], item[2] or vim.NIL) + local val = item[2] + if val == nil then + val = vim.NIL + end + put(item[1], val) end put('build', version_build) diff --git a/src/nvim/generators/nvim_version.lua.in b/src/nvim/generators/nvim_version.lua.in index d0dbf77922..c29141fc68 100644 --- a/src/nvim/generators/nvim_version.lua.in +++ b/src/nvim/generators/nvim_version.lua.in @@ -2,7 +2,7 @@ return { {"major", ${NVIM_VERSION_MAJOR}}, {"minor", ${NVIM_VERSION_MINOR}}, {"patch", ${NVIM_VERSION_PATCH}}, - {"prerelease", "$NVIM_VERSION_PRERELEASE" ~= ""}, + {"prerelease", "${NVIM_VERSION_PRERELEASE}" ~= ""}, {"api_level", ${NVIM_API_LEVEL}}, {"api_compatible", ${NVIM_API_LEVEL_COMPAT}}, {"api_prerelease", ${NVIM_API_PRERELEASE}}, |