aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/eval.c3
-rw-r--r--test/functional/helpers.lua1
-rw-r--r--third-party/CMakeLists.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 1a80198515..5975777261 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -14588,8 +14588,7 @@ static void get_system_output_as_rettv(typval_T *argvars, typval_T *rettv,
if (res == NULL) {
if (retlist) {
// return an empty list when there's no output
- rettv->v_type = VAR_LIST;
- rettv->vval.v_list = list_alloc();
+ rettv_list_alloc(rettv);
}
return;
}
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 27d8493a12..b758817b41 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -161,6 +161,7 @@ end
local function clear()
if session then
session:request('vim_command', 'qa!')
+ session._async_session._msgpack_stream._loop:exit()
end
local loop = Loop.new()
local msgpack_stream = MsgpackStream.new(loop)
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 38c5533ddd..39bd31896e 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -194,7 +194,7 @@ if(USE_BUNDLED_LUAROCKS)
add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client
COMMAND ${DEPS_BIN_DIR}/luarocks
- ARGS build https://raw.githubusercontent.com/neovim/lua-client/master/nvim-client-0.0.1-2.rockspec CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} LIBUV_DIR=${DEPS_INSTALL_DIR}
+ ARGS build https://raw.githubusercontent.com/neovim/lua-client/0aefb79d8f60fd180594f376d20144414e1f37a4/nvim-client-0.0.1-3.rockspec CC=${DEPS_C_COMPILER} LD=${DEPS_C_COMPILER} LIBUV_DIR=${DEPS_INSTALL_DIR}
DEPENDS lpeg libuv)
add_custom_target(nvim-client
DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client)