diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/org/org-timer.el | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/org/org-timer.el')
| -rw-r--r-- | lisp/org/org-timer.el | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el index b6802fe8b04..852d18579a4 100644 --- a/lisp/org/org-timer.el +++ b/lisp/org/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. |