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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 531ef52a9969f77be5ff81a75951838197cda05c..c4e5390267b52fc80bbe6bd740a493fa2008de36 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>
 
        * calc/calc-units.el (math-extract-units): Preserve powers

diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index a1bba2ddb6e282224f27fe5d6212039049c2419c..0aa31f717ed1d1e04efec95ccee98f7474dc1357 100644 (file)
--- 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)