# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 872730197 0
# Node ID f51f46bef1831368398a00da591a693931b4ce92
# Parent  7d59cb04d2d9562e5f6a8a34f98984c914d814e6
(timer-event-handler): Reactivate timer first,
then run the handler function.

diff -r 7d59cb04d2d9 -r f51f46bef183 lisp/timer.el
--- a/lisp/timer.el	Thu Aug 28 00:33:03 1997 +0000
+++ b/lisp/timer.el	Thu Aug 28 01:03:17 1997 +0000
@@ -264,10 +264,6 @@
 	(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 @@
 				      (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.