summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/if_lua.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/if_lua.c b/src/if_lua.c
index 20cdbbceb..9852c618e 100644
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -576,6 +576,8 @@ luaV_totypval(lua_State *L, int pos, typval_T *tv)
{
int status = OK;
+ tv->v_lock = 0;
+
switch (lua_type(L, pos))
{
case LUA_TBOOLEAN:
diff --git a/src/version.c b/src/version.c
index 54469ffc2..2d9455929 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1117,
+/**/
1116,
/**/
1115,