aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/emacs-lisp/timer.el
diff options
context:
space:
mode:
authorPaul Eggert2013-05-16 21:09:16 -0700
committerPaul Eggert2013-05-16 21:09:16 -0700
commitdc5dcb4bc598fa54dcd05becac2f04fcd03e8fcc (patch)
tree90ab6d6b1dd662079135e5064d0cc77f4246d8ba /lisp/emacs-lisp/timer.el
parent1db165f042ce2cf467013e314c81ecd16d7aa2c9 (diff)
downloademacs-dc5dcb4bc598fa54dcd05becac2f04fcd03e8fcc.tar.gz
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/timer.el')
-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."
124 (floor (mod next-sec-psec 1000000))))) 124 (floor (mod next-sec-psec 1000000)))))
125 125
126(defun timer-relative-time (time secs &optional usecs psecs) 126(defun timer-relative-time (time secs &optional usecs psecs)
127 "Advance TIME by SECS seconds and optionally USECS nanoseconds 127 "Advance TIME by SECS seconds and optionally USECS microseconds
128and PSECS picoseconds. SECS may be either an integer or a 128and PSECS picoseconds. SECS may be either an integer or a
129floating point number." 129floating point number."
130 (let ((delta (if (floatp secs) 130 (let ((delta (if (floatp secs)
@@ -139,7 +139,7 @@ floating point number."
139 (time-less-p (timer--time t1) (timer--time t2))) 139 (time-less-p (timer--time t1) (timer--time t2)))
140 140
141(defun timer-inc-time (timer secs &optional usecs psecs) 141(defun timer-inc-time (timer secs &optional usecs psecs)
142 "Increment the time set in TIMER by SECS seconds, USECS nanoseconds, 142 "Increment the time set in TIMER by SECS seconds, USECS microseconds,
143and PSECS picoseconds. SECS may be a fraction. If USECS or PSECS are 143and PSECS picoseconds. SECS may be a fraction. If USECS or PSECS are
144omitted, they are treated as zero." 144omitted, they are treated as zero."
145 (setf (timer--time timer) 145 (setf (timer--time timer)