[Emacs-diffs] Changes to emacs/lisp/timer.el

[Juanma Barranquero]

Index: emacs/lisp/timer.el
diff -c emacs/lisp/timer.el:1.25 emacs/lisp/timer.el:1.26
*** emacs/lisp/timer.el:1.25    Fri Oct  5 05:26:53 2001
--- emacs/lisp/timer.el Fri Jul 12 07:56:30 2002
***************
*** 137,150 ****
      (aset timer 3 (or (nth 2 time) 0))))
  
  (defun timer-set-time-with-usecs (timer time usecs &optional delta)
!   "Set the trigger time of TIMER to TIME.
  TIME must be in the internal format returned by, e.g., `current-time'.
! If optional third argument DELTA is a non-zero integer, make the timer
  fire repeatedly that many seconds apart."
    (or (timerp timer)
        (error "Invalid timer"))
!   (aset timer 1 (car time))
!   (aset timer 2 (if (consp (cdr time)) (car (cdr time)) (cdr time)))
    (aset timer 3 usecs)
    (aset timer 4 (and (numberp delta) (> delta 0) delta))
    timer)
--- 137,151 ----
      (aset timer 3 (or (nth 2 time) 0))))
  
  (defun timer-set-time-with-usecs (timer time usecs &optional delta)
!   "Set the trigger time of TIMER to TIME plus USECS.
  TIME must be in the internal format returned by, e.g., `current-time'.
! The microsecond count from TIME is ignored, and USECS is used instead.
! If optional fourth argument DELTA is a non-zero integer, make the timer
  fire repeatedly that many seconds apart."
    (or (timerp timer)
        (error "Invalid timer"))
!   (aset timer 1 (nth 0 time))
!   (aset timer 2 (nth 1 time))
    (aset timer 3 usecs)
    (aset timer 4 (and (numberp delta) (> delta 0) delta))
    timer)