aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPaul Eggert2020-03-08 00:20:57 -0800
committerPaul Eggert2020-03-08 00:20:57 -0800
commit4415534ef01309417e8f552eb4c075095603f2f3 (patch)
treeca55889bb9636c2b2d16e4a29fcc14b2d18e3fdc /doc
parente4fb95fa18072cedb021a82f7aa0e79fa6ca387a (diff)
parent0a3682a566d5563e3d57defe49359cee236e0274 (diff)
downloademacs-4415534ef01309417e8f552eb4c075095603f2f3.tar.gz
emacs-4415534ef01309417e8f552eb4c075095603f2f3.zip
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.texi5
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.
1979 1979
1980@defun time-subtract t1 t2 1980@defun time-subtract t1 t2
1981This returns the time difference @var{t1} @minus{} @var{t2} between 1981This returns the time difference @var{t1} @minus{} @var{t2} between
1982two time values, normally as a Lisp timestamp but as a float 1982two time values, as a Lisp time value. The result is exact and its clock
1983if either argument is infinite or a NaN@.
1984When the result is a timestamp, it is exact and its clock
1985resolution is no worse than the worse of its two arguments' resolutions. 1983resolution is no worse than the worse of its two arguments' resolutions.
1984The result is floating-point only if it is infinite or a NaN.
1986If you need the difference in units 1985If you need the difference in units
1987of elapsed seconds, you can convert it with @code{time-convert} or 1986of elapsed seconds, you can convert it with @code{time-convert} or
1988@code{float-time}. @xref{Time Conversion}. 1987@code{float-time}. @xref{Time Conversion}.