From b0144c1bbe7c2d53b5255f44e176a4e57f6c3a30 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 9 May 1997 19:57:36 +0000 Subject: [PATCH] (timer-event-handler): Take timer as arg directly. Don't bind a key in special-event-map. --- lisp/timer.el | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/lisp/timer.el b/lisp/timer.el index c06c685ccf5..68a9e105dae 100644 --- a/lisp/timer.el +++ b/lisp/timer.el @@ -237,12 +237,6 @@ fire repeatedly that many seconds apart." (setq timer-idle-list (delq (car tail) timer-idle-list))) (setq tail (cdr tail))))) -;; Set up the common handler for all timer events. Since the event has -;; the timer as parameter we can still distinguish. Note that using -;; special-event-map ensures that event timer events that arrive in the -;; middle of a key sequence being entered are still handled correctly. -(define-key special-event-map [timer-event] 'timer-event-handler) - ;; Record the last few events, for debugging. (defvar timer-event-last-2 nil) (defvar timer-event-last-1 nil) @@ -259,14 +253,13 @@ TIME is a time-list." (low (- (nth 1 time) (aref timer 2)))) (+ low (* high 65536)))) -(defun timer-event-handler (event) - "Call the handler for the timer in the event EVENT." - (interactive "e") +(defun timer-event-handler (timer) + "Call the handler for the timer TIMER. +This function is called, by name, directly by the C code." (setq timer-event-last-2 timer-event-last-1) (setq timer-event-last-1 timer-event-last) - (setq timer-event-last (cons event (copy-sequence event))) - (let ((inhibit-quit t) - (timer (car-safe (cdr-safe event)))) + (setq timer-event-last timer) + (let ((inhibit-quit t)) (if (timerp timer) (progn ;; Delete from queue. -- 2.39.5