diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Doc/Zsh/params.yo | 5 | ||||
| -rw-r--r-- | Src/jobs.c | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index bd8629898..67695c12c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-09-21 Peter Stephenson <pws@csr.com> + + * 30687 (typo fixed): Doc/Zsh/params.yo, Src/jobs.c: don't + REPORTTIME if zleactive (but time keyword is allowed). + 2012-09-15 Peter Stephenson <p.w.stephenson@ntlworld.com> * Александр Балезин: 30667: Completion/Unix/Command/_ip: add @@ -164,5 +169,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5721 $ +* $Revision: 1.5722 $ ***************************************************** diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo index 5991921f8..bf9a68ba8 100644 --- a/Doc/Zsh/params.yo +++ b/Doc/Zsh/params.yo @@ -1225,7 +1225,10 @@ vindex(REPORTTIME) item(tt(REPORTTIME))( If nonnegative, commands whose combined user and system execution times (measured in seconds) are greater than this value have timing -statistics printed for them. +statistics printed for them. Output is suppressed for commands +executed within the line editor, including completion; commands +explicitly marked with the tt(time) keyword still cause the summary +to be printed in this case. ) vindex(REPLY) item(tt(REPLY))( diff --git a/Src/jobs.c b/Src/jobs.c index c9c549e1e..ddd997c49 100644 --- a/Src/jobs.c +++ b/Src/jobs.c @@ -868,6 +868,8 @@ should_report_time(Job j) /* can this ever happen? */ if (!j->procs) return 0; + if (zleactive) + return 0; #ifdef HAVE_GETRUSAGE reporttime -= j->procs->ti.ru_utime.tv_sec + j->procs->ti.ru_stime.tv_sec; |