diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-03-08 00:20:57 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-03-08 00:20:57 -0800 |
| commit | 4415534ef01309417e8f552eb4c075095603f2f3 (patch) | |
| tree | ca55889bb9636c2b2d16e4a29fcc14b2d18e3fdc /doc | |
| parent | e4fb95fa18072cedb021a82f7aa0e79fa6ca387a (diff) | |
| parent | 0a3682a566d5563e3d57defe49359cee236e0274 (diff) | |
| download | emacs-4415534ef01309417e8f552eb4c075095603f2f3.tar.gz | |
Merge from origin/emacs-27
0a3682a566 * src/timefns.c: Add comments.
b16ba4041d ; lisp/emacs-lisp/seq.el: Explain why we don't use cl-lib ...
3cbf4cb796 Eliminate use of cl-concatenate in 'seq' package
363d927086 Fix bug with JIT stealth timers
818333c85a * doc/lispref/os.texi (time-subtract): Doc fix.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/os.texi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index cf4ef52abfb..e72858bbf1a 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -1979,10 +1979,9 @@ The result is @code{nil} if either argument is a NaN. @defun time-subtract t1 t2 This returns the time difference @var{t1} @minus{} @var{t2} between -two time values, normally as a Lisp timestamp but as a float -if either argument is infinite or a NaN@. -When the result is a timestamp, it is exact and its clock +two time values, as a Lisp time value. The result is exact and its clock resolution is no worse than the worse of its two arguments' resolutions. +The result is floating-point only if it is infinite or a NaN. If you need the difference in units of elapsed seconds, you can convert it with @code{time-convert} or @code{float-time}. @xref{Time Conversion}. |