walkero
/
lite-xl
1
0
Fork 0
Code Issues 7 Pull Requests Projects Releases 14 Wiki Activity

Merge branch 'dev' into process-refactor

This commit is contained in:
Takase 2021-07-06 17:16:07 +08:00 committed by GitHub
parent ccbf676f50 79581b551b
commit 57fca752a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/process.c
View File

@ -370,5 +370,11 @@ int luaopen_process(lua_State *L)
L_SETNUM(L, -1, "REDIRECT_STDOUT", REPROC_REDIRECT_STDOUT); L_SETNUM(L, -1, "REDIRECT_STDOUT", REPROC_REDIRECT_STDOUT);
lua_setfield(L, -2, "CONSTANTS"); // process.CONSTANTS lua_setfield(L, -2, "CONSTANTS"); // process.CONSTANTS
lua_pushnumber(L, REPROC_INFINITE);
lua_setfield(L, -2, "WAIT_INFINITE");
lua_pushnumber(L, REPROC_DEADLINE);
lua_setfield(L, -2, "WAIT_DEADLINE");
return 1; return 1;
} }

4
src/main.c
View File

@ -172,8 +172,8 @@ init_lua:
"local core\n" "local core\n"
"xpcall(function()\n" "xpcall(function()\n"
" HOME = os.getenv('" LITE_OS_HOME "')\n" " HOME = os.getenv('" LITE_OS_HOME "')\n"
" local exedir = EXEFILE:match(\"^(.*)" LITE_PATHSEP_PATTERN LITE_NONPATHSEP_PATTERN "$\")\n" " local exedir = EXEFILE:match('^(.*)" LITE_PATHSEP_PATTERN LITE_NONPATHSEP_PATTERN "$')\n"
" local prefix = exedir:match(\"^(.*)" LITE_PATHSEP_PATTERN "bin$\")\n" " local prefix = exedir:match('^(.*)" LITE_PATHSEP_PATTERN "bin$')\n"
" dofile((MACOS_RESOURCES or (prefix and prefix .. '/share/lite-xl' or exedir .. '/data')) .. '/core/start.lua')\n" " dofile((MACOS_RESOURCES or (prefix and prefix .. '/share/lite-xl' or exedir .. '/data')) .. '/core/start.lua')\n"
" core = require('core')\n" " core = require('core')\n"
" core.init()\n" " core.init()\n"