diff options
| author | Kenichi Handa <handa@gnu.org> | 2013-05-23 00:12:59 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@gnu.org> | 2013-05-23 00:12:59 +0900 |
| commit | e1b96d7e637cf76864013f8dba68135f07638ab8 (patch) | |
| tree | 1a2ccd5961a60f0268a37444071e8cd7a2255fbc /lisp/emacs-lisp/timer.el | |
| parent | e6d2f1553635a746396f2f4261dde31e03e0fdd1 (diff) | |
| parent | 5d0acd9d3bb26adfac1c80b78aa48dc8b2d34fe0 (diff) | |
| download | emacs-e1b96d7e637cf76864013f8dba68135f07638ab8.tar.gz emacs-e1b96d7e637cf76864013f8dba68135f07638ab8.tar.bz2 emacs-e1b96d7e637cf76864013f8dba68135f07638ab8.zip | |
merge trunk
Diffstat (limited to 'lisp/emacs-lisp/timer.el')
| -rw-r--r-- | lisp/emacs-lisp/timer.el | 4 |
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) |