branch: externals/org
commit ca300ada2186bf8e1937ece3ac848d36b5f931c6
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Kyle Meyer <k...@kyleam.com>
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.]
---
lisp/org-timer.el | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index b6802fe..852d185 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -366,7 +366,7 @@ VALUE can be `on', `off', or `paused'."
(setq org-timer-mode-line-timer nil))
(when org-timer-display
(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 ()
"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.
TITLE will be appended to the notification message displayed when
time is up."
- (let ((msg (format "%s: time out" title)))
+ (let ((msg (format "%s: time out" title))
+ (sound org-clock-sound))
(run-with-timer
- secs nil `(lambda ()
- (setq org-timer-countdown-timer nil
- org-timer-start-time nil)
- (org-notify ,msg ,org-clock-sound)
- (org-timer-set-mode-line 'off)
- (run-hooks 'org-timer-done-hook)))))
+ secs nil (lambda ()
+ (setq org-timer-countdown-timer nil
+ org-timer-start-time nil)
+ (org-notify msg sound)
+ (org-timer-set-mode-line 'off)
+ (run-hooks 'org-timer-done-hook)))))
(defun org-timer--get-timer-title ()
"Construct timer title.
