aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2014-04-10 11:01:06 -0400
committermitchell <70453897+667e-11@users.noreply.github.com>2014-04-10 11:01:06 -0400
commit8f4e032c261e817f939ffd2c65e878d4f6eea0ec (patch)
tree5cc890b4c3ce4e2b8e58edf1645f1a4ccdcd71cc /modules
parent2321c7ad5ab98d0be3b932f00bb91601b313cef9 (diff)
downloadtextadept-8f4e032c261e817f939ffd2c65e878d4f6eea0ec.tar.gz
textadept-8f4e032c261e817f939ffd2c65e878d4f6eea0ec.zip
Temporarily disable spawn in OSX due to GLib crashes.
Diffstat (limited to 'modules')
-rw-r--r--modules/textadept/run.lua12
1 files changed, 2 insertions, 10 deletions
diff --git a/modules/textadept/run.lua b/modules/textadept/run.lua
index a4b5f189..9a3e561b 100644
--- a/modules/textadept/run.lua
+++ b/modules/textadept/run.lua
@@ -106,7 +106,7 @@ local function command(commands, event)
preferred_view = view
local events_emit = events.emit
local function emit_output(output)
- ui.SILENT_PRINT = true
+ ui.SILENT_PRINT = not OSX and true
for line in output:gmatch('[^\r\n]+') do
events_emit(event, data, line:iconv('UTF-8', _CHARSET))
end
@@ -116,16 +116,8 @@ local function command(commands, event)
if commands == M.build_commands then emit_output('> cd '..cwd) end
emit_output('> '..command)
- local p, err = spawn(command, cwd, emit_output, emit_output,
- not OSX and emit_status or nil)
+ local p, err = spawn(command, cwd, emit_output, emit_output, emit_status)
if not p then error(err) end
- if OSX then
- -- Workaround for GTKOSX abort caused by failed assertion.
- timeout(1, function()
- if p:status() == 'running' then return true end
- emit_status('Process completed')
- end)
- end
M.proc, M.cwd = p, cwd
end