diff --git a/ChangeLog b/ChangeLog index b73a7ed80..4df20c334 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2020-04-20 dana + * unposted: Doc/Zsh/mod_system.yo: Adjust documentation from + workers/45708 + * Cedric Ware: 45708: Doc/Zsh/mod_system.yo, Src/Modules/system.c, Src/compat.c, Src/utils.c, Test/V14system.ztst: Enable sub-second timeout in zsystem flock diff --git a/Doc/Zsh/mod_system.yo b/Doc/Zsh/mod_system.yo index 06ea87918..8f525c576 100644 --- a/Doc/Zsh/mod_system.yo +++ b/Doc/Zsh/mod_system.yo @@ -203,10 +203,9 @@ if the tt(-i) var(interval) option is given, otherwise once a second. so that the shell waits only until the var(timeout) and not longer.) If the attempt times out, status 2 is returned. -(Note: var(timeout) must be less than -ifzman(2^30-1)ifnzman(2NOTRANS(@sup{30})-1) seconds (about 34 years), -and var(interval) must be less than 0.999 * LONG_MAX microseconds -(only about 35 minutes on 32-bit systems).) +(Note: var(timeout) is limited to 2^30-1 seconds (about 34 years), and +var(interval) to 0.999 * LONG_MAX microseconds (only about 35 minutes +on 32-bit systems).) If the option tt(-e) is given, the file descriptor for the lock is preserved when the shell uses tt(exec) to start a new process;