summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossymiles@gmail.com>2014-11-19 17:58:34 +1100
committerJames Ross-Gowan <rossymiles@gmail.com>2014-11-22 18:15:12 +1100
commitb2d048440472c8b22abd1945e9ca2cfdfd27f2d0 (patch)
treebff024f63be0cbb4fe9cdd2877fe508e7c4a2a03
parent060bf43d02e27a0aeb95cfd2d2e9ab08242f4155 (diff)
downloadmpv-b2d048440472c8b22abd1945e9ca2cfdfd27f2d0.tar.bz2
mpv-b2d048440472c8b22abd1945e9ca2cfdfd27f2d0.tar.xz
manpage: update utils.subprocess() for Windows
-rw-r--r--DOCS/man/lua.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/DOCS/man/lua.rst b/DOCS/man/lua.rst
index e01754b3ef..e09792a277 100644
--- a/DOCS/man/lua.rst
+++ b/DOCS/man/lua.rst
@@ -562,8 +562,6 @@ strictly part of the guaranteed API.
Runs an external process and waits until it exits. Returns process status
and the captured output.
- This function is not available on Microsoft Windows.
-
The paramater ``t`` is a table. The function reads the following entries:
``args``
@@ -595,6 +593,9 @@ strictly part of the guaranteed API.
terminated in an unusual way. The string ``init`` if the process
could not be started.
+ On Windows, ``killed`` is only returned when the process has been
+ killed by mpv as a result of ``cancellable`` being set to ``true``.
+
In all cases, ``mp.resume_all()`` is implicitly called.
``utils.parse_json(str [, trail])``