[Emacs-diffs] /srv/bzr/emacs/trunk r112620: Doc string fix for "nanoseconds".

[Paul Eggert]

------------------------------------------------------------
revno: 112620
fixes bug: http://debbugs.gnu.org/14406
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2013-05-16 21:09:16 -0700
message:
  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".
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/timer.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-17 02:57:09 +0000
+++ b/lisp/ChangeLog    2013-05-17 04:09:16 +0000
@@ -1,3 +1,9 @@
+2013-05-17  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        * calc/calc-units.el (math-extract-units): Preserve powers

=== modified file 'lisp/emacs-lisp/timer.el'
--- a/lisp/emacs-lisp/timer.el  2013-04-10 13:31:35 +0000
+++ b/lisp/emacs-lisp/timer.el  2013-05-17 04:09:16 +0000
@@ -124,7 +124,7 @@
          (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 @@
   (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)