mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-20 06:56:05 +02:00
Code

30687 with typo corrected: don't REPORTTIME if zleactive

This commit is contained in:
Peter Stephenson 2012-09-21 12:45:12 +00:00
parent 0c5526bec0
commit 8e43f7f3c8
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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 $
*****************************************************

5
Doc/Zsh/params.yo
View File

@ -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))(

2
Src/jobs.c
View File

@ -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;