diff options
Diffstat (limited to 'lisp/type-break.el')
| -rw-r--r-- | lisp/type-break.el | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/lisp/type-break.el b/lisp/type-break.el index be6ac27ae73..182f4656b16 100644 --- a/lisp/type-break.el +++ b/lisp/type-break.el @@ -586,13 +586,13 @@ INTERVAL is the full length of an interval (defaults to TIME)." (type-break-check-post-command-hook) (type-break-cancel-schedule) (type-break-time-warning-schedule time 'reset) - (type-break-run-at-time (max 1 time) nil 'type-break-alarm) + (run-at-time (max 1 time) nil 'type-break-alarm) (setq type-break-time-next-break (type-break-time-sum start (or interval time)))) (defun type-break-cancel-schedule () (type-break-cancel-time-warning-schedule) - (type-break-cancel-function-timers 'type-break-alarm) + (cancel-function-timers 'type-break-alarm) (setq type-break-alarm-p nil) (setq type-break-time-next-break nil)) @@ -623,7 +623,7 @@ INTERVAL is the full length of an interval (defaults to TIME)." ;(let (type-break-current-time-warning-interval) ; (type-break-cancel-time-warning-schedule)) - (type-break-run-at-time (max 1 time) nil 'type-break-time-warning-alarm) + (run-at-time (max 1 time) nil 'type-break-time-warning-alarm) (cond (resetp @@ -633,7 +633,7 @@ INTERVAL is the full length of an interval (defaults to TIME)." (setq type-break-warning-countdown-string-type "seconds")))))))) (defun type-break-cancel-time-warning-schedule () - (type-break-cancel-function-timers 'type-break-time-warning-alarm) + (cancel-function-timers 'type-break-time-warning-alarm) (remove-hook 'type-break-post-command-hook 'type-break-time-warning) (setq type-break-current-time-warning-interval type-break-time-warning-intervals) @@ -986,21 +986,6 @@ With optional non-nil ALL, force redisplay of all mode-lines." (add-hook 'post-command-hook 'type-break-run-tb-post-command-hook 'append)) -;;; Timer wrapper functions -;; -;; These shield type-break from variations in the interval timer packages -;; for different versions of Emacs. - -(defun type-break-run-at-time (time repeat function) - (condition-case nil (or (require 'timer) (require 'itimer)) (error nil)) - (run-at-time time repeat function)) - -(defvar timer-dont-exit) -(defun type-break-cancel-function-timers (function) - (let ((timer-dont-exit t)) - (cancel-function-timers function))) - - ;;; Demo wrappers (defun type-break-catch-up-event () @@ -1146,6 +1131,8 @@ With optional non-nil ALL, force redisplay of all mode-lines." (kill-buffer buffer-name)))))) (define-obsolete-function-alias 'timep 'type-break-timep "29.1") +(define-obsolete-function-alias 'type-break-run-at-time #'run-at-time "30.1") +(define-obsolete-function-alias 'type-break-cancel-function-timers #'cancel-function-timers "30.1") (provide 'type-break) |