Merge 0.11->trunk

This commit is contained in:
Kim Alvefur 2020-10-15 17:23:21 +02:00
commit eefbd36485

View file

@ -20,6 +20,8 @@ int strop_and(lua_State *L) {
const char *str_a = luaL_checklstring(L, 1, &a);
const char *str_b = luaL_checklstring(L, 2, &b);
luaL_buffinit(L, &buf);
if(a == 0 || b == 0) {
lua_settop(L, 1);
return 1;
@ -39,6 +41,8 @@ int strop_or(lua_State *L) {
const char *str_a = luaL_checklstring(L, 1, &a);
const char *str_b = luaL_checklstring(L, 2, &b);
luaL_buffinit(L, &buf);
if(a == 0 || b == 0) {
lua_settop(L, 1);
return 1;