Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2014-06-11 10:21:37 +02:00
commit afcc3c0b83

View File

@ -454,7 +454,7 @@ int lj_debug_getinfo(lua_State *L, const char *what, lj_Debug *ar, int ext)
lj_debug_shortname(ar->short_src, name, pt->firstline); lj_debug_shortname(ar->short_src, name, pt->firstline);
ar->linedefined = (int)firstline; ar->linedefined = (int)firstline;
ar->lastlinedefined = (int)(firstline + pt->numline); ar->lastlinedefined = (int)(firstline + pt->numline);
ar->what = firstline ? "Lua" : "main"; ar->what = (firstline || !pt->numline) ? "Lua" : "main";
} else { } else {
ar->source = "=[C]"; ar->source = "=[C]";
ar->short_src[0] = '['; ar->short_src[0] = '[';