From 83ff83c08c2a9841677c4dab24b1af5bd034b3e3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 28 Aug 1997 01:03:17 +0000 Subject: [PATCH] (timer-event-handler): Reactivate timer first, then run the handler function. --- lisp/timer.el | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lisp/timer.el b/lisp/timer.el index 68a9e105dae..f60763c2f68 100644 --- a/lisp/timer.el +++ b/lisp/timer.el @@ -264,10 +264,6 @@ This function is called, by name, directly by the C code." (progn ;; Delete from queue. (cancel-timer timer) - ;; Run handler - (condition-case nil - (apply (aref timer 5) (aref timer 6)) - (error nil)) ;; Re-schedule if requested. (if (aref timer 4) (if (aref timer 7) @@ -282,7 +278,13 @@ This function is called, by name, directly by the C code." (aref timer 4)))) (if (> repeats timer-max-repeats) (timer-inc-time timer (* (aref timer 4) repeats))))) - (timer-activate timer)))) + (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. -- 2.39.5