summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2015-02-04 22:02:37 +0100
committerBram Moolenaar <bram@vim.org>2015-02-04 22:02:37 +0100
commitafd44688a87b89b77cc3f35a32d3c232275d1801 (patch)
tree2b9e9313d162e75532398faca9936300a859afa3
parent26ae6f4aa7470abb4d1f4b38e3850ea357eea23f (diff)
downloadvim-afd44688a87b89b77cc3f35a32d3c232275d1801.tar.gz
updated for version 7.4.619v7.4.619v7-4-619
Problem: luaV_setref() not returning the correct value. Solution: Return one.
-rw-r--r--src/if_lua.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/if_lua.c b/src/if_lua.c
index b4789c44..0ca81e3d 100644
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -1517,7 +1517,7 @@ luaV_luaeval (lua_State *L)
return 0;
}
luaV_totypval(L, -1, rettv);
- return 0;
+ return 1;
}
static int
@@ -1530,7 +1530,8 @@ luaV_setref (lua_State *L)
luaV_getfield(L, LUAVIM_LIST);
luaV_getfield(L, LUAVIM_DICT);
lua_pushnil(L);
- while (!abort && lua_next(L, lua_upvalueindex(1)) != 0) /* traverse cache table */
+ /* traverse cache table */
+ while (!abort && lua_next(L, lua_upvalueindex(1)) != 0)
{
lua_getmetatable(L, -1);
if (lua_rawequal(L, -1, 2)) /* list? */
diff --git a/src/version.c b/src/version.c
index 791d007b..8bf1fbbc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 619,
+/**/
618,
/**/
617,