Rename ido-max-prompt-width to ido-max-file-prompt-width for consistency.

[gnu-emacs] / lisp / timer.el

diff --git a/lisp/timer.el b/lisp/timer.el
index b93ec44665242970fb3469aec5f2a972a1be0332..3131fe3c175deeb9c0ed39bd1ec229958bbfc3bd 100644 (file)
--- a/lisp/timer.el
+++ b/lisp/timer.el
@@ -127,7 +127,7 @@ SECS may be a fraction."
 
 (defun timer-inc-time (timer secs &optional usecs)
   "Increment the time set in TIMER by SECS seconds and USECS microseconds.
-SECS may be a fraction."
+SECS may be a fraction.  If USECS is omitted, that means it is zero."
   (let ((time (timer-relative-time
               (list (aref timer 1) (aref timer 2) (aref timer 3))
               secs
@@ -149,6 +149,9 @@ fire repeatedly that many seconds apart."
   (aset timer 3 usecs)
   (aset timer 4 (and (numberp delta) (> delta 0) delta))
   timer)
+(make-obsolete 'timer-set-time-with-usecs
+               "use `timer-set-time' and `timer-inc-time' instead."
+               "21.4")
 
 (defun timer-set-function (timer function &optional args)
   "Make TIMER call FUNCTION with optional ARGS when triggering."