diff options
| -rw-r--r-- | core/init.lua | 1 | ||||
| -rw-r--r-- | src/lutf8libext.patch | 15 |
2 files changed, 10 insertions, 6 deletions
diff --git a/core/init.lua b/core/init.lua index e23366c7..8df6b6e9 100644 --- a/core/init.lua +++ b/core/init.lua @@ -12,7 +12,6 @@ args = require('args') _L = require('locale') require('file_io') require('lfs_ext') -for k, v in pairs(require('utf8_ext')) do utf8[k] = v end require('ui') keys = require('keys') diff --git a/src/lutf8libext.patch b/src/lutf8libext.patch index ab881928..5dd975ce 100644 --- a/src/lutf8libext.patch +++ b/src/lutf8libext.patch @@ -123,12 +123,17 @@ ENTRY(find), ENTRY(gmatch), ENTRY(gsub), -@@ -1301,11 +1319,13 @@ - luaL_newlib(L, libs); +@@ -1297,15 +1315,17 @@ + { NULL, NULL } + }; + ++lua_getglobal(L, "utf8"); + #if LUA_VERSION_NUM >= 502 +- luaL_newlib(L, libs); ++ luaL_setfuncs(L, libs, 0); #else - lua_createtable(L, 0, sizeof(libs)/sizeof(libs[0])); -- luaL_register(L, NULL, libs); -+ luaL_register(L, "utf8_ext", libs); +- lua_createtable(L, 0, sizeof(libs)/sizeof(libs[0])); + luaL_register(L, NULL, libs); #endif +#if 0 |