summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-05-16 21:09:16 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-05-16 21:09:16 -0700
commitdc5dcb4bc598fa54dcd05becac2f04fcd03e8fcc (patch)
tree90ab6d6b1dd662079135e5064d0cc77f4246d8ba /lisp/emacs-lisp
parent1db165f042ce2cf467013e314c81ecd16d7aa2c9 (diff)
downloademacs-dc5dcb4bc598fa54dcd05becac2f04fcd03e8fcc.tar.gz
emacs-dc5dcb4bc598fa54dcd05becac2f04fcd03e8fcc.tar.bz2
emacs-dc5dcb4bc598fa54dcd05becac2f04fcd03e8fcc.zip
Doc string fix for "nanoseconds".
* emacs-lisp/timer.el (timer-relative-time, timer-inc-time): Fix doc string typo that had "nanoseconds" instead of "microseconds". Fixes: debbugs:14406
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/timer.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index a1bba2ddb6e..0aa31f717ed 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -124,7 +124,7 @@ of SECS seconds since the epoch. SECS may be a fraction."
(floor (mod next-sec-psec 1000000)))))
(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
floating point number."
(let ((delta (if (floatp secs)
@@ -139,7 +139,7 @@ floating point number."
(time-less-p (timer--time t1) (timer--time t2)))
(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
omitted, they are treated as zero."
(setf (timer--time timer)