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

[Miles Bader]

Index: emacs/lisp/emacs-lisp/timer.el
diff -c emacs/lisp/emacs-lisp/timer.el:1.1.2.1 
emacs/lisp/emacs-lisp/timer.el:1.1.2.2
*** emacs/lisp/emacs-lisp/timer.el:1.1.2.1      Fri Apr 16 12:50:14 2004
--- emacs/lisp/emacs-lisp/timer.el      Mon Jun 28 07:29:46 2004
***************
*** 161,167 ****
    (aset timer 6 args)
    timer)
  
! (defun timer-activate (timer)
    "Put TIMER on the list of active timers."
    (if (and (timerp timer)
           (integerp (aref timer 1))
--- 161,167 ----
    (aset timer 6 args)
    timer)
  
! (defun timer-activate (timer &optional triggered-p)
    "Put TIMER on the list of active timers."
    (if (and (timerp timer)
           (integerp (aref timer 1))
***************
*** 184,190 ****
        (if last
            (setcdr last (cons timer timers))
          (setq timer-list (cons timer timers)))
!       (aset timer 0 nil)
        (aset timer 7 nil)
        nil)
      (error "Invalid or uninitialized timer")))
--- 184,190 ----
        (if last
            (setcdr last (cons timer timers))
          (setq timer-list (cons timer timers)))
!       (aset timer 0 triggered-p)
        (aset timer 7 nil)
        nil)
      (error "Invalid or uninitialized timer")))
***************
*** 270,276 ****
    (setq timer-event-last timer)
    (let ((inhibit-quit t))
      (if (timerp timer)
!       (progn
          ;; Delete from queue.
          (cancel-timer timer)
          ;; Re-schedule if requested.
--- 270,276 ----
    (setq timer-event-last timer)
    (let ((inhibit-quit t))
      (if (timerp timer)
!       (let (retrigger)
          ;; Delete from queue.
          (cancel-timer timer)
          ;; Re-schedule if requested.
***************
*** 287,299 ****
                                      (aref timer 4))))
                      (if (> repeats timer-max-repeats)
                          (timer-inc-time timer (* (aref timer 4) repeats)))))
!               (timer-activate timer)))
          ;; Run handler.
          ;; We do this after rescheduling so that the handler function
          ;; can cancel its own timer successfully with cancel-timer.
          (condition-case nil
              (apply (aref timer 5) (aref timer 6))
!           (error nil)))
        (error "Bogus timer event"))))
  
  ;; This function is incompatible with the one in levents.el.
--- 287,302 ----
                                      (aref timer 4))))
                      (if (> repeats timer-max-repeats)
                          (timer-inc-time timer (* (aref timer 4) repeats)))))
!               (timer-activate timer t)
!               (setq retrigger t)))
          ;; Run handler.
          ;; We do this after rescheduling so that the handler function
          ;; can cancel its own timer successfully with cancel-timer.
          (condition-case nil
              (apply (aref timer 5) (aref timer 6))
!           (error nil))
!         (if retrigger
!             (aset timer 0 nil)))
        (error "Bogus timer event"))))
  
  ;; This function is incompatible with the one in levents.el.