bug#14406: [PATCH] Timer docs say "nanoseconds" where they should say "microseconds"

bug#14406: [PATCH] Timer docs say "nanoseconds" where they should say "microseconds"

[Kelly Dean]

[-- Attachment #1: Type: text/plain, Size: 103 bytes --]

The third element of the list returned by make_lisp_time is microseconds, so the timer docs are wrong.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: timer-docstring-units-bug.patch --]
[-- Type: text/x-diff; name="timer-docstring-units-bug.patch", Size: 874 bytes --]

--- emacs-24.3/lisp/emacs-lisp/timer.el
+++ emacs-24.3/lisp/emacs-lisp/timer.el
@@ -119,7 +119,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)
@@ -134,7 +134,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)

bug#14406: [PATCH] Timer docs say "nanoseconds" where they should say "microseconds"

[Paul Eggert]

Thanks; I installed that as trunk bzr 112620.