procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Doc string fix for "nanoseconds".

Browse source 
* emacs-lisp/timer.el (timer-relative-time, timer-inc-time):
Fix doc string typo that had "nanoseconds" instead of "microseconds".

Fixes: debbugs:14406
This commit is contained in:
Paul Eggert 2013-05-16 21:09:16 -07:00
parent 1db165f042
commit dc5dcb4bc5
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2013-05-17 Paul Eggert <eggert@cs.ucla.edu>
Doc string fix for "nanoseconds" (Bug#14406).
* emacs-lisp/timer.el (timer-relative-time, timer-inc-time):
Fix doc string typo that had "nanoseconds" instead of "microseconds".
2013-05-17 Jay Belanger <jay.p.belanger@gmail.com> 2013-05-17 Jay Belanger <jay.p.belanger@gmail.com>
* calc/calc-units.el (math-extract-units): Preserve powers * calc/calc-units.el (math-extract-units): Preserve powers

4
lisp/emacs-lisp/timer.el
View file

@ -124,7 +124,7 @@ of SECS seconds since the epoch. SECS may be a fraction."
(floor (mod next-sec-psec 1000000))))) (floor (mod next-sec-psec 1000000)))))
(defun timer-relative-time (time secs &optional usecs psecs) (defun timer-relative-time (time secs &optional usecs psecs)
"Advance TIME by SECS seconds and optionally USECS nanoseconds "Advance TIME by SECS seconds and optionally USECS microseconds
and PSECS picoseconds. SECS may be either an integer or a and PSECS picoseconds. SECS may be either an integer or a
floating point number." floating point number."
(let ((delta (if (floatp secs) (let ((delta (if (floatp secs)
@ -139,7 +139,7 @@ floating point number."
(time-less-p (timer--time t1) (timer--time t2))) (time-less-p (timer--time t1) (timer--time t2)))
(defun timer-inc-time (timer secs &optional usecs psecs) (defun timer-inc-time (timer secs &optional usecs psecs)
"Increment the time set in TIMER by SECS seconds, USECS nanoseconds, "Increment the time set in TIMER by SECS seconds, USECS microseconds,
and PSECS picoseconds. SECS may be a fraction. If USECS or PSECS are and PSECS picoseconds. SECS may be a fraction. If USECS or PSECS are
omitted, they are treated as zero." omitted, they are treated as zero."
(setf (timer--time timer) (setf (timer--time timer)