procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make recent timer changes more backwards-compatible

Browse source 
* lisp/emacs-lisp/timer.el (timerp, timer-event-handler): Make
backwards-compatible with old .elc files that have their own
versions of `timer-create'd structures.
This commit is contained in:
Lars Ingebrigtsen 2021-09-03 10:40:21 +02:00
parent d67ce5ef10
commit d1f3247666
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/emacs-lisp/timer.el
View file

@ -57,7 +57,10 @@
(defun timerp (object)
"Return t if OBJECT is a timer."
(and (vectorp object) (= (length object) 10)))
(and (vectorp object)
;; Timers are now ten elements, but old .elc code may have
;; shorter versions of `timer-create'.
(<= 9 (length object) 10)))
(defsubst timer--check (timer)
(or (timerp timer) (signal 'wrong-type-argument (list #'timerp timer))))
@ -293,7 +296,8 @@ This function is called, by name, directly by the C code."
repeats)))))
;; If we want integral multiples, we have to recompute
;; the repetition.
(when (and (timer--integral-multiple timer)
(when (and (> (length timer) 9) ; Backwards compatible.
(timer--integral-multiple timer)
(not (timer--idle-delay timer)))
(setf (timer--time timer)
(timer-next-integral-multiple-of-time