0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 22:07:49 +00:00

Backport commit 09ed51b9c from Emacs

* lisp/org-timer.el (org-timer--run-countdown-timer): Use closures.

lisp/org/org-timer.el (org-timer--run-countdown-timer): Use closures
09ed51b9c89390059ccae30c0ae5dc39bc20523b
Stefan Monnier
Tue May 18 19:54:38 2021 -0400

[km: This was independently applied to master with 1a5a326f1.]
This commit is contained in:
Stefan Monnier 2021-05-18 19:54:38 -04:00 committed by Kyle Meyer
parent 64689d9bb7
commit ca300ada21

View file

@ -366,7 +366,7 @@ VALUE can be `on', `off', or `paused'."
(setq org-timer-mode-line-timer nil)) (setq org-timer-mode-line-timer nil))
(when org-timer-display (when org-timer-display
(setq org-timer-mode-line-timer (setq org-timer-mode-line-timer
(run-with-timer 1 1 'org-timer-update-mode-line)))))) (run-with-timer 1 1 #'org-timer-update-mode-line))))))
(defun org-timer-update-mode-line () (defun org-timer-update-mode-line ()
"Update the timer time in the mode line." "Update the timer time in the mode line."
@ -456,14 +456,15 @@ using three `C-u' prefix arguments."
"Start countdown timer that will last SECS. "Start countdown timer that will last SECS.
TITLE will be appended to the notification message displayed when TITLE will be appended to the notification message displayed when
time is up." time is up."
(let ((msg (format "%s: time out" title))) (let ((msg (format "%s: time out" title))
(sound org-clock-sound))
(run-with-timer (run-with-timer
secs nil `(lambda () secs nil (lambda ()
(setq org-timer-countdown-timer nil (setq org-timer-countdown-timer nil
org-timer-start-time nil) org-timer-start-time nil)
(org-notify ,msg ,org-clock-sound) (org-notify msg sound)
(org-timer-set-mode-line 'off) (org-timer-set-mode-line 'off)
(run-hooks 'org-timer-done-hook))))) (run-hooks 'org-timer-done-hook)))))
(defun org-timer--get-timer-title () (defun org-timer--get-timer-title ()
"Construct timer title. "Construct timer title.