summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-02-04 23:08:01 +0100
committerBram Moolenaar <Bram@vim.org>2015-02-04 23:08:01 +0100
commitf554a3285e45d8c3f95f9b8f43bd0897185b95cb (patch)
treecfdede0d5f5693efed385874d60f83ae24cb4362
parent934b13619318c5d0721797266b9a9060546e07a5 (diff)
downloadvim-git-f554a3285e45d8c3f95f9b8f43bd0897185b95cb.tar.gz
updated for version 7.4.621v7.4.621
Problem: Returning 1 in the wrong function. (Raymond Ko) Solution: Return 1 in the right function (hopefully).
-rw-r--r--src/if_lua.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/if_lua.c b/src/if_lua.c
index 0ca81e3d8..d926f7346 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 1;
+ return 0;
}
static int
@@ -1548,7 +1548,7 @@ luaV_setref (lua_State *L)
abort = set_ref_in_item(&tv, copyID, NULL, NULL);
}
lua_pushinteger(L, abort);
- return 0;
+ return 1;
}
static int
diff --git a/src/version.c b/src/version.c
index f46f917b4..be1bee391 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 */
/**/
+ 621,
+/**/
620,
/**/
619,