summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2015-02-03 23:10:46 +0100
committerBram Moolenaar <bram@vim.org>2015-02-03 23:10:46 +0100
commit7de715df3d6438fb9f9d15abf3855000ff662ae1 (patch)
tree9525bcf2322f065e7169e36cfa51ceced41be3b0
parente21bd6e3dd3265392eb49ec53a5b1d5b800ccce6 (diff)
downloadvim-7de715df3d6438fb9f9d15abf3855000ff662ae1.tar.gz
updated for version 7.4.618v7.4.618v7-4-618
Problem: luaV_setref() is missing a return statement. (Ozaki Kiichi) Solution: Put the return statement back.
-rw-r--r--src/if_lua.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/if_lua.c b/src/if_lua.c
index 148d6242..b4789c44 100644
--- a/src/if_lua.c
+++ b/src/if_lua.c
@@ -1547,6 +1547,7 @@ luaV_setref (lua_State *L)
abort = set_ref_in_item(&tv, copyID, NULL, NULL);
}
lua_pushinteger(L, abort);
+ return 0;
}
static int
diff --git a/src/version.c b/src/version.c
index 138a29ab..791d007b 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 */
/**/
+ 618,
+/**/
617,
/**/
616,